Fix cloud policy duplicate registrations issue.

chrome/browser/policy/cloud_policy_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 "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/policy/proto/chrome_settings.pb.h"
 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
+#include "chrome/browser/policy/test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
@@ skipping 98 matching lines @@
             temp_dir_.path().BaseName()));
     ASSERT_TRUE(test_server_->Start());
 
     std::string url = test_server_->GetURL("device_management").spec();
 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    // Checks that no policies have been loaded by the other providers before
-    // setting up the cloud connection. Other policies configured in the test
-    // machine will interfere with these tests.
-    const PolicyMap& map = g_browser_process->policy_service()->GetPolicies(
-        PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
-    if (!map.empty()) {
-      base::DictionaryValue dict;
-      for (PolicyMap::const_iterator it = map.begin(); it != map.end(); ++it)
-        dict.SetWithoutPathExpansion(it->first, it->second.value->DeepCopy());
-      ADD_FAILURE()
-          << "There are pre-existing policies in this machine that will "
-          << "interfere with these tests. Policies found: " << dict;
-    }
+    ASSERT_TRUE(PolicyServiceIsEmpty(g_browser_process->policy_service()))
+        << "Pre-existing policies in this machine will make this test fail.";
 
     BrowserPolicyConnector* connector =
         g_browser_process->browser_policy_connector();
     connector->ScheduleServiceInitialization(0);
 
 #if defined(OS_CHROMEOS)
     UserCloudPolicyManagerChromeOS* policy_manager =
         connector->GetUserCloudPolicyManager();
     ASSERT_TRUE(policy_manager);
 #else
@@ skipping 117 matching lines @@
 
   // They should now serialize to the same bytes.
   std::string chrome_settings_serialized;
   std::string cloud_policy_serialized;
   ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
   ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
   EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
 }
 
 }  // namespace policy