Move reusable part of LoginPolicyTestBase into a helper class.

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.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 <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/policy/login_policy_test_base.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "policy/policy_constants.h"
 
 namespace policy {
 
 // Boolean parameter is used to run this test for webview (true) and for
 // iframe (false) GAIA sign in.
 class UserCloudPolicyManagerTest : public LoginPolicyTestBase,
                                    public testing::WithParamInterface<bool> {
  protected:
   UserCloudPolicyManagerTest() : LoginPolicyTestBase() {
     set_use_webview(GetParam());
   }
 
-  scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const override {
+  void GetMandatoryPoliciesValue(base::DictionaryValue* policy) const override {
     scoped_ptr<base::ListValue> list(new base::ListValue);
     list->AppendString("chrome://policy");
     list->AppendString("chrome://about");
 
-    scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
-    dict->Set(key::kRestoreOnStartupURLs, list.Pass());
-    dict->SetInteger(key::kRestoreOnStartup,
-                     SessionStartupPref::kPrefValueURLs);
-
-    return dict;
+    policy->Set(key::kRestoreOnStartupURLs, list.Pass());
+    policy->SetInteger(key::kRestoreOnStartup,
+                       SessionStartupPref::kPrefValueURLs);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyManagerTest);
 };
 
 IN_PROC_BROWSER_TEST_P(UserCloudPolicyManagerTest, StartSession) {
   const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"};
 
   SkipToLoginScreen();
@@ skipping 14 matching lines @@
     EXPECT_EQ(GURL(kStartupURLs[i]),
               tabs->GetWebContentsAt(i)->GetVisibleURL());
   }
 }
 
 INSTANTIATE_TEST_CASE_P(UserCloudPolicyManagerTestSuite,
                         UserCloudPolicyManagerTest,
                         testing::Bool());
 
 }  // namespace policy