Remove old cloud policy code.

chrome/browser/policy/cloud_policy_browsertest.cc

Index: chrome/browser/policy/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud_policy_browsertest.cc
index 50d6c3a41452ee12d79cbde28b564528dfe51acd..0869b594a7643ba787de82fd7a706ae955e2dbd2 100644
--- a/chrome/browser/policy/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud_policy_browsertest.cc
@@ -14,7 +14,6 @@
 #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/cloud_policy_data_store.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/policy/proto/chrome_settings.pb.h"
@@ -109,25 +108,6 @@ std::string GetTestPolicy() {
                             GetTestUser());
 }
 
-#if defined(OS_CHROMEOS)
-void SetUpOldStackBeforeCreatingBrowser() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kDisableCloudPolicyService);
-}
-
-void SetUpOldStackAfterCreatingBrowser(Browser* browser) {
-  // Flush the token cache loading.
-  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
-  content::RunAllPendingInMessageLoop();
-  // Set a fake gaia token.
-  BrowserPolicyConnector* connector =
-      g_browser_process->browser_policy_connector();
-  CloudPolicyDataStore* store = connector->GetUserCloudPolicyDataStore();
-  ASSERT_TRUE(store);
-  store->SetupForTesting("", "bogus", GetTestUser(), "bogus", true);
-}
-#endif
-
 void SetUpNewStackBeforeCreatingBrowser() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kLoadCloudPolicyOnSignin);
@@ -278,15 +258,6 @@ IN_PROC_BROWSER_TEST_P(CloudPolicyTest, FetchPolicy) {
       expected.Equals(policy_service->GetPolicies(POLICY_DOMAIN_CHROME, "")));
 }
 
-#if defined(OS_CHROMEOS)
-INSTANTIATE_TEST_CASE_P(
-    OldStackCloudPolicyTest,
-    CloudPolicyTest,
-    testing::Values(
-        TestSetup(SetUpOldStackBeforeCreatingBrowser,
-                  SetUpOldStackAfterCreatingBrowser)));
-#endif
-
 INSTANTIATE_TEST_CASE_P(

[Joao da Silva, 2013/01/17 09:38:05]

There's no need to make these test parameterized now, care to change to TEST_Fs?
:-)

[Mattias Nissler (ping if slow), 2013/01/22 10:31:39]

Done.

     NewStackCloudPolicyTest,
     CloudPolicyTest,