commit 62fd938c4cb6904659bc7bc61b64d5683e74f06c
author tfarina <tfarina@chromium.org> Tue Dec 01 14:09:53 2015 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 01 22:10:49 2015 +0000
tree a929045eb07137b5b3e607e1ecc157efe1999f86
parent a03d0b5bf038318e98fcdc5dae00a7250f45a03e

tools/gn: replace usage of linked_ptr by using scoped_ptr

With C++11, we can use scoped_ptr in STL containers now.

BUG=556939
TEST=gn gen + gn_unittests
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/1480423003

Cr-Original-Commit-Position: refs/heads/master@{#362520}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4695e89361e0fdc2eaa3b3ba57362fa6e05f10cf

tools/gn/loader_unittest.cc

diff --git a/tools/gn/loader_unittest.cc b/tools/gn/loader_unittest.cc
index 199b120..914e475 100644
--- a/tools/gn/loader_unittest.cc
+++ b/tools/gn/loader_unittest.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "base/memory/linked_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/build_settings.h"
@@ -55,8 +54,7 @@
     return true;
   }
 
-  // Owning pointers.
-  typedef std::map<SourceFile, linked_ptr<CannedResult> > CannedResponseMap;
+  typedef std::map<SourceFile, scoped_ptr<CannedResult> > CannedResponseMap;
   CannedResponseMap canned_responses_;
 
   std::vector< std::pair<SourceFile, Callback> > pending_;
@@ -70,7 +68,7 @@
 // Sets a given response for a given source file.
 void MockInputFileManager::AddCannedResponse(const SourceFile& source_file,
                                              const std::string& source) {
-  CannedResult* canned = new CannedResult;
+  scoped_ptr<CannedResult> canned(new CannedResult);
   canned->input_file.reset(new InputFile(source_file));
   canned->input_file->SetContents(source);
 
@@ -83,7 +81,7 @@
   canned->root = Parser::Parse(canned->tokens, &err).Pass();
   EXPECT_FALSE(err.has_error());
 
-  canned_responses_[source_file] = linked_ptr<CannedResult>(canned);
+  canned_responses_[source_file] = std::move(canned);
 }
 
 bool MockInputFileManager::HasOnePending(const SourceFile& f) const {