Update monet.

net/sdch/sdch_owner_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 <utility>
+
 #include "base/memory/memory_pressure_listener.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "net/base/sdch_manager.h"
 #include "net/log/net_log.h"
 #include "net/sdch/sdch_owner.h"
@@ skipping 752 matching lines @@
 };
 
 // Test an empty persistence store.
 TEST_F(SdchOwnerPersistenceTest, Empty) {
   ResetOwner(false);
   EXPECT_EQ(0, owner_->GetDictionaryCountForTesting());
 }
 
 // Test a persistence store with an empty dictionary.
 TEST_F(SdchOwnerPersistenceTest, Persistent_EmptyDict) {
-  pref_store_->SetValue("SDCH", new base::DictionaryValue(),
+  pref_store_->SetValue("SDCH", make_scoped_ptr(new base::DictionaryValue()),
                         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   ResetOwner(false);
   EXPECT_EQ(0, owner_->GetDictionaryCountForTesting());
 }
 
 // Test a persistence store with a bad version number.
 TEST_F(SdchOwnerPersistenceTest, Persistent_BadVersion) {
-  base::DictionaryValue* sdch_dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> sdch_dict(new base::DictionaryValue());
   sdch_dict->SetInteger("version", 2);
-  pref_store_->SetValue("SDCH", sdch_dict,
+  pref_store_->SetValue("SDCH", std::move(sdch_dict),
                         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   ResetOwner(false);
   EXPECT_EQ(0, owner_->GetDictionaryCountForTesting());
 }
 
 // Test a persistence store with an empty dictionaries map.
 TEST_F(SdchOwnerPersistenceTest, Persistent_EmptyDictList) {
-  base::DictionaryValue* sdch_dict = new base::DictionaryValue();
+  scoped_ptr<base::DictionaryValue> sdch_dict(new base::DictionaryValue());
   scoped_ptr<base::DictionaryValue> dicts(new base::DictionaryValue());
   sdch_dict->SetInteger("version", 1);
   sdch_dict->Set("dictionaries", dicts.Pass());
-  pref_store_->SetValue("SDCH", sdch_dict,
+  pref_store_->SetValue("SDCH", std::move(sdch_dict),
                         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   ResetOwner(false);
   EXPECT_EQ(0, owner_->GetDictionaryCountForTesting());
 }
 
 TEST_F(SdchOwnerPersistenceTest, OneDict) {
   const GURL url("http://www.example.com/dict");
   ResetOwner(false);
   EXPECT_EQ(0, owner_->GetDictionaryCountForTesting());
@@ skipping 102 matching lines @@
 
   EXPECT_TRUE(CompleteLoadFromURL(url0, "0", true));
   EXPECT_TRUE(CompleteLoadFromURL(url1, "1", false));
 
   tester.ExpectTotalCount("Sdch3.NetworkBytesSpent", 1);
   tester.ExpectUniqueSample("Sdch3.NetworkBytesSpent",
                             CreateDictionary(url1, "1").size(), 1);
 }
 
 }  // namespace net