Revert "Revert of Reland: No longer start up profile if there was an error fetching policy. (patchs…

chrome/browser/chromeos/policy/user_policy_test_helper.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_USER_POLICY_TEST_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_
 
 #include <string>
 
 #include "base/files/scoped_temp_dir.h"
@@ skipping 31 matching lines @@
   // profile. Alternatively, a login can be simulated, which makes it
   // unnecessary to call this function.
   void WaitForInitialPolicy(Profile* profile);
 
   // Update the policy test server with the given policy. Then refresh and wait
   // for the new policy being applied to |profile|.
   void UpdatePolicy(const base::DictionaryValue& mandatory_policy,
                     const base::DictionaryValue& recommended_policy,
                     Profile* profile);
 
+  void DeletePolicyFile();
+
  private:
   void WritePolicyFile(const base::DictionaryValue& mandatory,
                        const base::DictionaryValue& recommended);
   base::FilePath PolicyFilePath() const;
 
   const std::string account_id_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<LocalPolicyTestServer> test_server_;
 
   DISALLOW_COPY_AND_ASSIGN(UserPolicyTestHelper);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_USER_POLICY_TEST_HELPER_H_