Third patch in getting rid of caching MessageLoop pointers and always using C...

chrome/browser/sync/profile_sync_service_unittest.cc

 // Copyright (c) 2006-2008 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 <stack>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/test/sync/test_http_bridge_factory.h"
 
 using std::vector;
@@ skipping 236 matching lines @@
   sync_api::WriteTransaction *trans_;
 
   // The change list we construct.
   vector<sync_api::SyncManager::ChangeRecord> changes_;
 };
 
 class ProfileSyncServiceTest : public testing::Test {
  protected:
   enum LoadOption { LOAD_FROM_STORAGE, DELETE_EXISTING_STORAGE };
   enum SaveOption { SAVE_TO_STORAGE, DONT_SAVE_TO_STORAGE };
-  ProfileSyncServiceTest() : model_(NULL) {
+  ProfileSyncServiceTest()
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_),
+        model_(NULL) {
     profile_.reset(new TestingProfile());
     profile_->set_has_history_service(true);
   }
   virtual ~ProfileSyncServiceTest() {
     // Kill the service before the profile.
     service_.reset();
     profile_.reset();
   }
 
   ModelAssociator* associator() {
@@ skipping 176 matching lines @@
   SyncBackendHost* backend() { return service_->backend_.get(); }
 
   // This serves as the "UI loop" on which the ProfileSyncService lives and
   // operates. It is needed because the SyncBackend can post tasks back to
   // the service, meaning it can't be null. It doesn't have to be running,
   // though -- OnInitializationCompleted is the only example (so far) in this
   // test where we need to Run the loop to swallow a task and then quit, to
   // avoid leaking the ProfileSyncService (the PostTask will retain the callee
   // and caller until the task is run).
   MessageLoop message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
 
   scoped_ptr<ProfileSyncService> service_;
   scoped_ptr<TestingProfile> profile_;
   BookmarkModel* model_;
 };
 
 TEST_F(ProfileSyncServiceTest, InitialState) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSyncService();
 
@@ skipping 816 matching lines @@
 
   // Restart the sync service.
   StartSyncService();
 
   // Make sure we're back in sync.  In real life, the user would need
   // to reauthenticate before this happens, but in the test, authentication
   // is sidestepped.
   ExpectBookmarkModelMatchesTestData();
   ExpectModelMatch();
 }