Some linked_ptr -> unique_ptr conversion in extensions/browser.

extensions/browser/value_store/value_store_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/value_store/value_store_unittest.h"
 
 #include <utility>
 
 #include "base/json/json_writer.h"
-#include "base/memory/linked_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // To save typing ValueStore::DEFAULTS everywhere.
 const ValueStore::WriteOptions DEFAULTS = ValueStore::DEFAULTS;
 
 // Gets the pretty-printed JSON for a value.
@@ skipping 60 matching lines @@
                                        << actual_result->status().message;
   }
 
   const ValueStoreChangeList& actual = actual_result->changes();
   if (expected.size() != actual.size()) {
     return testing::AssertionFailure() <<
         "Actual has wrong size, expecting " << expected.size() <<
         " but was " << actual.size();
   }
 
-  std::map<std::string, linked_ptr<ValueStoreChange> > expected_as_map;
-  for (ValueStoreChangeList::const_iterator it = expected.begin();
-      it != expected.end(); ++it) {
-    expected_as_map[it->key()] =
-        linked_ptr<ValueStoreChange>(new ValueStoreChange(*it));
-  }
+  std::map<std::string, std::unique_ptr<ValueStoreChange>> expected_as_map;
+  for (const ValueStoreChange& change : expected)
+    expected_as_map[change.key()] = base::MakeUnique<ValueStoreChange>(change);
 
   std::set<std::string> keys_seen;
 
   for (ValueStoreChangeList::const_iterator it = actual.begin();
       it != actual.end(); ++it) {
     if (keys_seen.count(it->key())) {
       return testing::AssertionFailure() <<
           "Multiple changes seen for key: " << it->key();
     }
     keys_seen.insert(it->key());
@@ skipping 387 matching lines @@
   {
     ValueStoreChangeList changes;
     changes.push_back(
         ValueStoreChange(key3_, val3_->CreateDeepCopy(), nullptr));
     changes.push_back(
         ValueStoreChange("qwerty", val3_->CreateDeepCopy(), nullptr));
     EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
     EXPECT_PRED_FORMAT2(ChangesEq, ValueStoreChangeList(), storage_->Clear());
   }
 }