Fifth patch in getting rid of caching MessageLoop pointers.

chrome/browser/importer/importer_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 "testing/gtest/include/gtest/gtest.h"
 
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <urlhist.h>
 #include <shlguid.h>
 #include <vector>
 
 #include "app/win_util.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_comptr_win.h"
 #include "base/stl_util-inl.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_paths.h"
 #include "webkit/glue/password_form.h"
 
 using webkit_glue::PasswordForm;
 
 class ImporterTest : public testing::Test {
  public:
+  ImporterTest()
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_) {}
  protected:
   virtual void SetUp() {
     // Creates a new profile in a new subdirectory in the temp directory.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_path_));
     file_util::AppendToPath(&test_path_, L"ImporterTest");
     file_util::Delete(test_path_, true);
     CreateDirectory(test_path_.c_str(), NULL);
     profile_path_ = test_path_;
     file_util::AppendToPath(&profile_path_, L"profile");
     CreateDirectory(profile_path_.c_str(), NULL);
@@ skipping 33 matching lines @@
       }
       ASSERT_TRUE(file_util::CopyDirectory(data_path,
                                            search_engine_path, false));
     }
 
     MessageLoop* loop = MessageLoop::current();
     ProfileInfo profile_info;
     profile_info.browser_type = FIREFOX3;
     profile_info.app_path = app_path_;
     profile_info.source_path = profile_path_;
-    scoped_refptr<ImporterHost> host = new ImporterHost(loop);
+    scoped_refptr<ImporterHost> host = new ImporterHost();
     host->SetObserver(observer);
     int items = HISTORY | PASSWORDS | FAVORITES;
     if (import_search_plugins)
       items = items | SEARCH_ENGINES;
     loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
         &ImporterHost::StartImportSettings, profile_info,
         static_cast<Profile*>(NULL), items, writer, true));
     loop->Run();
   }
 
   MessageLoopForUI message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
   std::wstring test_path_;
   std::wstring profile_path_;
   std::wstring app_path_;
 };
 
 const int kMaxPathSize = 5;
 
 typedef struct {
   const bool in_toolbar;
   const int path_size;
@@ skipping 262 matching lines @@
   // Sets up a special history link.
   ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
   res = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
                                         CLSCTX_INPROC_SERVER);
   ASSERT_TRUE(res == S_OK);
   res = url_history_stg2->AddUrl(kIEIdentifyUrl, kIEIdentifyTitle, 0);
   ASSERT_TRUE(res == S_OK);
 
   // Starts to import the above settings.
   MessageLoop* loop = MessageLoop::current();
-  scoped_refptr<ImporterHost> host = new ImporterHost(loop);
+  scoped_refptr<ImporterHost> host = new ImporterHost();
 
   TestObserver* observer = new TestObserver();
   host->SetObserver(observer);
   ProfileInfo profile_info;
   profile_info.browser_type = MS_IE;
   profile_info.source_path = test_path_;
 
   loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
       &ImporterHost::StartImportSettings, profile_info,
       static_cast<Profile*>(NULL), HISTORY | PASSWORDS | FAVORITES, observer,
@@ skipping 255 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
   file_util::AppendToPath(&data_path, L"firefox2_searchplugins");
   if (!file_util::PathExists(FilePath::FromWStringHack(data_path))) {
     // TODO(maruel):  Create test data that we can open source!
     LOG(ERROR) << L"Missing internal test data";
     return;
   }
   ASSERT_TRUE(file_util::CopyDirectory(data_path, search_engine_path, false));
 
   MessageLoop* loop = MessageLoop::current();
-  scoped_refptr<ImporterHost> host = new ImporterHost(loop);
+  scoped_refptr<ImporterHost> host = new ImporterHost();
   FirefoxObserver* observer = new FirefoxObserver();
   host->SetObserver(observer);
   ProfileInfo profile_info;
   profile_info.browser_type = FIREFOX2;
   profile_info.app_path = app_path_;
   profile_info.source_path = profile_path_;
 
   loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
       &ImporterHost::StartImportSettings, profile_info,
       static_cast<Profile*>(NULL),
@@ skipping 175 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, Firefox35Importer) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer =
       new Firefox3Observer(import_search_engines);
   Firefox3xImporterTest(L"firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }