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.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 "chrome/browser/chromeos/policy/user_policy_test_helper.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 110 matching lines @@
   policy::ProfilePolicyConnector* const profile_connector =
       policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile);
   policy::PolicyService* const policy_service =
       profile_connector->policy_service();
 
   base::RunLoop run_loop;
   policy_service->RefreshPolicies(run_loop.QuitClosure());
   run_loop.Run();
 }
 
+void UserPolicyTestHelper::DeletePolicyFile() {
+  base::DeleteFile(PolicyFilePath(), false);
+}
+
 void UserPolicyTestHelper::WritePolicyFile(
     const base::DictionaryValue& mandatory,
     const base::DictionaryValue& recommended) {
   const std::string policy = BuildPolicy(
       mandatory, recommended, dm_protocol::kChromeUserPolicyType, account_id_);
   const int bytes_written =
       base::WriteFile(PolicyFilePath(), policy.data(), policy.size());
   ASSERT_EQ(static_cast<int>(policy.size()), bytes_written);
 }
 
 base::FilePath UserPolicyTestHelper::PolicyFilePath() const {
   return temp_dir_.path().AppendASCII("policy.json");
 }
 
 }  // namespace policy