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

chrome/browser/policy/cloud_policy_subsystem_unittest.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 <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 86 matching lines @@
   arg3->response_code = 200;
 }
 
 // Tests CloudPolicySubsystem by intercepting its network requests.
 // The requests are intercepted by PolicyRequestInterceptor and they are
 // logged by LoggingWorkScheduler for further examination.
 class CloudPolicySubsystemTestBase : public testing::Test {
  public:
   CloudPolicySubsystemTestBase()
       : ui_thread_(BrowserThread::UI, &loop_),
-        io_thread_(BrowserThread::IO, &loop_) {
-  }
+        file_thread_(BrowserThread::FILE, &loop_),

[Mattias Nissler (ping if slow), 2012/03/30 11:46:35]

why?

[Joao da Silva, 2012/03/30 16:36:58]

Because otherwise the UserPolicyCache DCHECKs on Load(), since it can't post to
FILE. That didn't happen before I introduced the DCHECK, but the cache wasn't
loading either.

+        io_thread_(BrowserThread::IO, &loop_) {}
 
-  virtual ~CloudPolicySubsystemTestBase() {
-  }
+  virtual ~CloudPolicySubsystemTestBase() {}
 
  protected:
   void StopMessageLoop() {
     loop_.QuitNow();
   }
 
   virtual void SetUp() {
     prefs_.reset(new TestingPrefService);
     CloudPolicySubsystem::RegisterPrefs(prefs_.get());
     ((TestingBrowserProcess*) g_browser_process)->SetLocalState(prefs_.get());
@@ skipping 121 matching lines @@
     }
 
     EXPECT_GE(count, 11)
         << "No enough requests were fired during the test run.";
   }
 
   ScopedTempDir temp_user_data_dir_;
 
   MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 
   scoped_ptr<EventLogger> logger_;
   scoped_ptr<CloudPolicyDataStore> data_store_;
   scoped_ptr<CloudPolicySubsystem> cloud_policy_subsystem_;
   scoped_ptr<PrefService> prefs_;
   CloudPolicyCacheBase* cache_;
 
   scoped_ptr<TestingPolicyURLFetcherFactory> factory_;
 
@@ skipping 197 matching lines @@
 TEST_F(CloudPolicySubsystemSerialNumberRecoveryTest, SerialRequested) {
   InSequence s;
   ExpectSuccessfulRegistration();
   ExpectPolicyRequest("", true, true);
   ExpectPolicyRequest(kMachineId, false, false);
   ExpectPolicyRequest("", false, false);
   ExecuteTest();
 }
 
 }  // policy