Refactored the CloudPolicyProvider so that it becomes initialized once and stays initialized.

chrome/browser/profiles/profile_browsertest.cc

 // Copyright (c) 2012 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/profiles/profile.h"
 
 #include "base/file_util.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "base/version.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 22 matching lines @@
     created_by_version = version_info.Version();
   } else {
     created_by_version = "1.0.0.0";
   }
   std::string pref_version =
       ChromeVersionService::GetVersion(profile->GetPrefs());
   // Assert that created_by_version pref gets set to current version.
   EXPECT_EQ(created_by_version, pref_version);
 }
 
+// Helper function that makes sure all the PrefStores for the profile's
+// PrefService are initialized.
+void InitializeAllPrefStores() {
+#if defined(OS_CHROMEOS)
+  // On enterprise Chrome OS devices, the policy PrefStore only becomes ready
+  // after refreshing the user policy, so that the Profile PrefService sees the
+  // right managed values. On non-enterprise devices this behavior is disabled
+  // after a sign-in; signal that here too, for the test.
+  policy::BrowserPolicyConnector* connector =
+      g_browser_process->browser_policy_connector();
+  if (connector)
+    connector->InitializeUserPolicy("", false);
+#endif
+}
+
 }  // namespace
 
 typedef InProcessBrowserTest ProfileBrowserTest;
 
 // Test OnProfileCreate is called with is_new_profile set to true when
 // creating a new profile synchronously.
 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateNewProfileSynchronous) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
@@ skipping 28 matching lines @@
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   MockProfileDelegate delegate;
   EXPECT_CALL(delegate, OnProfileCreated(testing::NotNull(), true, true));
 
   scoped_ptr<Profile> profile(Profile::CreateProfile(
       temp_dir.path(), &delegate, Profile::CREATE_MODE_ASYNCHRONOUS));
   ASSERT_TRUE(profile.get());
 
+  InitializeAllPrefStores();
+
   // Wait for the profile to be created.
   ui_test_utils::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_PROFILE_CREATED,
       content::Source<Profile>(profile.get()));
   observer.Wait();
   CheckChromeVersion(profile.get(), true);
 }
 
 // Test OnProfileCreate is called with is_new_profile set to false when
 // creating a profile asynchronously with an existing prefs file.
 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateOldProfileAsynchronous) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   CreatePrefsFileInDirectory(temp_dir.path());
 
   MockProfileDelegate delegate;
   EXPECT_CALL(delegate, OnProfileCreated(testing::NotNull(), true, false));
   scoped_ptr<Profile> profile(Profile::CreateProfile(
       temp_dir.path(), &delegate, Profile::CREATE_MODE_ASYNCHRONOUS));
   ASSERT_TRUE(profile.get());
 
+  InitializeAllPrefStores();
+
   // Wait for the profile to be created.
   ui_test_utils::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_PROFILE_CREATED,
       content::Source<Profile>(profile.get()));
   observer.Wait();
   CheckChromeVersion(profile.get(), false);
 }
 
 // Test that a README file is created for profiles that didn't have it.
 IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ProfileReadmeCreated) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   MockProfileDelegate delegate;
   EXPECT_CALL(delegate, OnProfileCreated(testing::NotNull(), true, true));
 
   // No delay before README creation.
   ProfileImpl::create_readme_delay_ms = 0;
 
   scoped_ptr<Profile> profile(Profile::CreateProfile(
       temp_dir.path(), &delegate, Profile::CREATE_MODE_ASYNCHRONOUS));
   ASSERT_TRUE(profile.get());
 
+  InitializeAllPrefStores();
+
   // Wait for the profile to be created.
   ui_test_utils::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_PROFILE_CREATED,
       content::Source<Profile>(profile.get()));
   observer.Wait();
 
   ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 
   // Verify that README exists.
   EXPECT_TRUE(file_util::PathExists(
@@ skipping 14 matching lines @@
   scoped_ptr<Profile> profile(Profile::CreateProfile(
       temp_dir.path(), &delegate, Profile::CREATE_MODE_SYNCHRONOUS));
   ASSERT_TRUE(profile.get());
 
   // Delete the Profile instance and run pending tasks (this includes the task
   // for README creation).
   profile.reset();
   ui_test_utils::RunAllPendingInMessageLoop();
   ui_test_utils::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 }