Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/webui/options/preferences_browsertest.cc

Index: chrome/browser/ui/webui/options/preferences_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index 9dfdf9adb37d8b8ccba6891885638de43d301b40..edfdb0ab43653db19cf76ea6104b4272d5fff2be 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -7,12 +7,12 @@
 #include <stddef.h>
 
 #include <iostream>
+#include <memory>
 #include <sstream>
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -264,7 +264,8 @@ void PreferencesBrowserTest::VerifyObservedPref(const std::string& json,
                                                 const std::string& controlledBy,
                                                 bool disabled,
                                                 bool uncommitted) {
-  scoped_ptr<base::Value> observed_value_ptr = base::JSONReader::Read(json);
+  std::unique_ptr<base::Value> observed_value_ptr =
+      base::JSONReader::Read(json);
   const base::DictionaryValue* observed_dict;
   ASSERT_TRUE(observed_value_ptr.get());
   ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict));
@@ -278,7 +279,8 @@ void PreferencesBrowserTest::VerifyObservedPrefs(
     const std::string& controlledBy,
     bool disabled,
     bool uncommitted) {
-  scoped_ptr<base::Value> observed_value_ptr = base::JSONReader::Read(json);
+  std::unique_ptr<base::Value> observed_value_ptr =
+      base::JSONReader::Read(json);
   const base::DictionaryValue* observed_dict;
   ASSERT_TRUE(observed_value_ptr.get());
   ASSERT_TRUE(observed_value_ptr->GetAsDictionary(&observed_dict));
@@ -346,7 +348,7 @@ void PreferencesBrowserTest::SetPref(const std::string& name,
                                      const base::Value* value,
                                      bool commit,
                                      std::string* observed_json) {
-  scoped_ptr<base::Value> commit_ptr(new base::FundamentalValue(commit));
+  std::unique_ptr<base::Value> commit_ptr(new base::FundamentalValue(commit));
   std::stringstream javascript;
   javascript << "testEnv.runAndReply(function() {"
              << "  Preferences.set" << type << "Pref("
@@ -719,7 +721,7 @@ class ManagedPreferencesBrowserTest : public PreferencesBrowserTest {
   // PreferencesBrowserTest implementation:
   void SetUpInProcessBrowserTestFixture() override {
     // Set up fake install attributes.
-    scoped_ptr<policy::StubEnterpriseInstallAttributes> attributes(
+    std::unique_ptr<policy::StubEnterpriseInstallAttributes> attributes(
         new policy::StubEnterpriseInstallAttributes());
     attributes->SetDomain("example.com");
     attributes->SetRegistrationUser("user@example.com");
@@ -819,7 +821,7 @@ class ProxyPreferencesBrowserTest : public PreferencesBrowserTest {
     SetupNetworkEnvironment();
     content::RunAllPendingInMessageLoop();
 
-    scoped_ptr<base::DictionaryValue> proxy_config_dict(
+    std::unique_ptr<base::DictionaryValue> proxy_config_dict(
         ProxyConfigDictionary::CreateFixedServers("127.0.0.1:8080",
                                                   "*.google.com, 1.2.3.4:22"));
 
@@ -920,11 +922,9 @@ class ProxyPreferencesBrowserTest : public PreferencesBrowserTest {
     const chromeos::NetworkState* network = GetDefaultNetwork();
     ASSERT_TRUE(network);
     onc::ONCSource actual_source;
-    scoped_ptr<ProxyConfigDictionary> proxy_dict =
+    std::unique_ptr<ProxyConfigDictionary> proxy_dict =
         chromeos::proxy_config::GetProxyConfigForNetwork(
-            pref_service_,
-            g_browser_process->local_state(),
-            *network,
+            pref_service_, g_browser_process->local_state(), *network,
             &actual_source);
     ASSERT_TRUE(proxy_dict);
     std::string actual_proxy_server;