Move reusable part of LoginPolicyTestBase into a helper class.

chrome/browser/chromeos/policy/login_policy_test_base.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_LOGIN_POLICY_TEST_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_LOGIN_POLICY_TEST_BASE_H_
 
 #include <string>
 
-#include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 
 namespace base {
-class FilePath;
 class DictionaryValue;
 }
 
 namespace policy {
 
-class LocalPolicyTestServer;
+class UserPolicyTestHelper;
 
 // This class can be used to implement tests which need policy to be set prior
 // to login.
 class LoginPolicyTestBase : public chromeos::OobeBaseTest {
  protected:
   LoginPolicyTestBase();
   ~LoginPolicyTestBase() override;
 
   // chromeos::OobeBaseTest::
   void SetUp() override;
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
 
-  virtual scoped_ptr<base::DictionaryValue> GetMandatoryPoliciesValue() const;
-  virtual scoped_ptr<base::DictionaryValue> GetRecommendedPoliciesValue() const;
+  virtual void GetMandatoryPoliciesValue(base::DictionaryValue* policy) const;
+  virtual void GetRecommendedPoliciesValue(base::DictionaryValue* policy) const;
 
   void SkipToLoginScreen();
   void LogIn(const std::string& user_id, const std::string& password);
 
   static const char kAccountPassword[];
   static const char kAccountId[];
 
  private:
   void SetUpGaiaServerWithAccessTokens();
-  void SetMergeSessionParams(const std::string& email);
-  void SetServerPolicy();
-  base::FilePath PolicyFilePath() const;
+  void SetMergeSessionParams();
 
-  scoped_ptr<LocalPolicyTestServer> test_server_;
-  base::ScopedTempDir temp_dir_;
+  scoped_ptr<UserPolicyTestHelper> user_policy_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginPolicyTestBase);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_LOGIN_POLICY_TEST_BASE_H_