Move TestingPrefService to use unique_ptr<Value>

components/prefs/pref_change_registrar_unittest.cc

 // Copyright (c) 2010 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 "components/prefs/pref_change_registrar.h"

[jdoerrie, 2017/03/29 09:28:00]

Nit: Missing New Line

[vabr (Chromium), 2017/03/29 09:43:56]

Thanks for catching this! Turns out clang-format moved this header up (to
conform with
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes),
but does not add blank lines separators. Will file a bug for that.

 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "components/prefs/pref_change_registrar.h"
+#include "base/memory/ptr_util.h"
 #include "components/prefs/pref_observer.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::Mock;
 using testing::Eq;
 
 namespace base {
@@ skipping 132 matching lines @@
 TEST_F(ObserveSetOfPreferencesTest, IsObserved) {
   std::unique_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar());
   EXPECT_TRUE(pref_set->IsObserved(kHomePage));
   EXPECT_TRUE(pref_set->IsObserved(kHomePageIsNewTabPage));
   EXPECT_FALSE(pref_set->IsObserved(kApplicationLocale));
 }
 
 TEST_F(ObserveSetOfPreferencesTest, IsManaged) {
   std::unique_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar());
   EXPECT_FALSE(pref_set->IsManaged());
-  pref_service_->SetManagedPref(kHomePage, new Value("http://crbug.com"));
+  pref_service_->SetManagedPref(kHomePage,
+                                base::MakeUnique<Value>("http://crbug.com"));
   EXPECT_TRUE(pref_set->IsManaged());
-  pref_service_->SetManagedPref(kHomePageIsNewTabPage, new Value(true));
+  pref_service_->SetManagedPref(kHomePageIsNewTabPage,
+                                base::MakeUnique<Value>(true));
   EXPECT_TRUE(pref_set->IsManaged());
   pref_service_->RemoveManagedPref(kHomePage);
   EXPECT_TRUE(pref_set->IsManaged());
   pref_service_->RemoveManagedPref(kHomePageIsNewTabPage);
   EXPECT_FALSE(pref_set->IsManaged());
 }
 
 TEST_F(ObserveSetOfPreferencesTest, Observe) {
   using testing::_;
   using testing::Mock;
 
   PrefChangeRegistrar pref_set;
   PrefChangeRegistrar::NamedChangeCallback callback = base::Bind(
       &ObserveSetOfPreferencesTest::OnPreferenceChanged,
       base::Unretained(this));
   pref_set.Init(pref_service_.get());
   pref_set.Add(kHomePage, callback);
   pref_set.Add(kHomePageIsNewTabPage, callback);
 
   EXPECT_CALL(*this, OnPreferenceChanged(kHomePage));
-  pref_service_->SetUserPref(kHomePage, new Value("http://crbug.com"));
+  pref_service_->SetUserPref(kHomePage,
+                             base::MakeUnique<Value>("http://crbug.com"));
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPreferenceChanged(kHomePageIsNewTabPage));
-  pref_service_->SetUserPref(kHomePageIsNewTabPage, new Value(true));
+  pref_service_->SetUserPref(kHomePageIsNewTabPage,
+                             base::MakeUnique<Value>(true));
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPreferenceChanged(_)).Times(0);
-  pref_service_->SetUserPref(kApplicationLocale, new Value("en_US.utf8"));
+  pref_service_->SetUserPref(kApplicationLocale,
+                             base::MakeUnique<Value>("en_US.utf8"));
   Mock::VerifyAndClearExpectations(this);
 }
 
 }  // namespace base