Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/prefs/pref_service_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/mock_pref_change_callback.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 221 matching lines @@
 // values to it.
 class WriteFlagChecker : public TestingPrefStore {
  public:
   WriteFlagChecker() {}
 
   void ReportValueChanged(const std::string& key, uint32 flags) override {
     SetLastWriteFlags(flags);
   }
 
   void SetValue(const std::string& key,
-                base::Value* value,
+                scoped_ptr<base::Value> value,
                 uint32 flags) override {
     SetLastWriteFlags(flags);
-    delete value;
   }
 
   void SetValueSilently(const std::string& key,
-                        base::Value* value,
+                        scoped_ptr<base::Value> value,
                         uint32 flags) override {
     SetLastWriteFlags(flags);
-    delete value;
   }
 
   void RemoveValue(const std::string& key, uint32 flags) override {
     SetLastWriteFlags(flags);
   }
 
   uint32 GetLastFlagsAndClear() {
     CHECK(last_write_flags_set_);
     uint32 result = last_write_flags_;
     last_write_flags_set_ = false;
@@ skipping 156 matching lines @@
 
   EXPECT_CALL(observer_, OnPreferenceChanged(_)).Times(0);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   base::ListValue empty;
   observer_.Expect(kName, &empty);
   prefs_.Set(kName, empty);
   Mock::VerifyAndClearExpectations(&observer_);
 }