Move reusable part of LoginPolicyTestBase into a helper class.

chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/policy/login_policy_test_base.h"
@@ skipping 18 matching lines @@
 }
 
 // Verifies that the |kRestoreOnStartup| and |kRestoreOnStartupURLs| policies
 // are honored on Chrome OS.
 class RestoreOnStartupTestChromeOS : public LoginPolicyTestBase {
  public:
   RestoreOnStartupTestChromeOS();
 
   // LoginPolicyTestBase:
   void SetUpCommandLine(base::CommandLine* command_line) override;
-  scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const override;
+  void GetMandatoryPoliciesValue(base::DictionaryValue* policy) const override;
 
   void LogInAndVerifyStartUpURLs();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RestoreOnStartupTestChromeOS);
 };
 
 RestoreOnStartupTestChromeOS::RestoreOnStartupTestChromeOS() {
 }
 
 void RestoreOnStartupTestChromeOS::SetUpCommandLine(
     base::CommandLine* command_line) {
   LoginPolicyTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kDisableChildAccountDetection);
 }
 
-scoped_ptr<base::DictionaryValue>
-RestoreOnStartupTestChromeOS::GetMandatoryPoliciesValue() const {
-  scoped_ptr<base::DictionaryValue> policy(new base::DictionaryValue);
+void RestoreOnStartupTestChromeOS::GetMandatoryPoliciesValue(
+    base::DictionaryValue* policy) const {
   policy->SetInteger(key::kRestoreOnStartup,
                      SessionStartupPref::kPrefValueURLs);
   scoped_ptr<base::ListValue> urls(new base::ListValue);
   urls->AppendString(kStartUpURL1);
   urls->AppendString(kStartUpURL2);
   policy->Set(key::kRestoreOnStartupURLs, urls.Pass());
-  return policy;
 }
 
 void RestoreOnStartupTestChromeOS::LogInAndVerifyStartUpURLs() {
   LogIn(kAccountId, kAccountPassword);
 
   const BrowserList* const browser_list =
       BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
   ASSERT_EQ(1U, browser_list->size());
   const Browser* const browser = browser_list->get(0);
   ASSERT_TRUE(browser);
@@ skipping 12 matching lines @@
 
 // Verify that the policies are honored on an existing user's login.
 IN_PROC_BROWSER_TEST_F(RestoreOnStartupTestChromeOS, LogInAndVerify) {
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
       content::NotificationService::AllSources()).Wait();
   LogInAndVerifyStartUpURLs();
 }
 
 }  // namespace policy