Get rid of MessageLoop* caching in extensions code.

chrome/browser/extensions/user_script_listener_unittest.cc

 // Copyright (c) 2009 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 <algorithm>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/thread.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 13 matching lines @@
 // A simple test URLRequestJob. We don't care what it does, only that whether it
 // starts and finishes.
 class SimpleTestJob : public URLRequestTestJob {
  public:
   explicit SimpleTestJob(URLRequest* request)
     : URLRequestTestJob(request, test_headers(), test_data_1(), true) {}
 };
 
 class MockUserScriptMaster : public UserScriptMaster {
  public:
-  explicit MockUserScriptMaster(MessageLoop* worker, const FilePath& script_dir)
-      : UserScriptMaster(worker, script_dir) {}
+  explicit MockUserScriptMaster(const FilePath& script_dir)
+      : UserScriptMaster(script_dir) {}
 
   virtual void StartScan() {
     // Do nothing. We want to manually control when scans occur.
   }
   void TestStartScan() {
     UserScriptMaster::StartScan();
   }
 };
 
 class MockIOThread : public ChromeThread {
@@ skipping 131 matching lines @@
 
   // Note: these variables are accessed on both threads, but since we only
   // one thread executes at a time, they are safe.
   std::vector<int> started_requests_;
   std::vector<int> completed_requests_;
 };
 
 class UserScriptListenerTest : public testing::Test {
  public:
   virtual void SetUp() {
+    ui_thread_.reset(new ChromeThread(ChromeThread::UI, &loop_));
+    file_thread_.reset(new ChromeThread(ChromeThread::FILE, &loop_));
     io_thread_.reset(new MockIOThread());
     base::Thread::Options options(MessageLoop::TYPE_IO, 0);
     io_thread_->StartWithOptions(options);
     DCHECK(io_thread_->message_loop());
     DCHECK(io_thread_->IsRunning());
 
     FilePath install_dir = profile_.GetPath()
         .AppendASCII(ExtensionsService::kInstallDirectoryName);
 
     resource_tester_ =
         new ResourceDispatcherHostTester(io_thread_->message_loop());
 
-    master_ = new MockUserScriptMaster(&loop_, install_dir);
+    master_ = new MockUserScriptMaster(install_dir);
 
     service_ = new ExtensionsService(&profile_,
                                      CommandLine::ForCurrentProcess(),
                                      profile_.GetPrefs(),
                                      install_dir,
-                                     &loop_,
-                                     &loop_,
                                      false);
     service_->set_extensions_enabled(true);
     service_->set_show_extensions_prompts(false);
     service_->ClearProvidersForTesting();
     service_->Init();
   }
 
   virtual void TearDown() {
     io_thread_.reset();
+    file_thread_.reset();
+    ui_thread_.reset();
     resource_tester_ = NULL;
   }
 
  protected:
   TestingProfile profile_;
   MessageLoopForUI loop_;
+  scoped_ptr<ChromeThread> ui_thread_;
+  scoped_ptr<ChromeThread> file_thread_;
   scoped_ptr<MockIOThread> io_thread_;
   scoped_refptr<ResourceDispatcherHostTester> resource_tester_;
   scoped_refptr<MockUserScriptMaster> master_;
   scoped_refptr<ExtensionsService> service_;
 };
 
 // Loads a single extension and ensures that requests to URLs with content
 // scripts are delayed.
 TEST_F(UserScriptListenerTest, SingleExtension) {
   FilePath extensions_path;
@@ skipping 68 matching lines @@
 
   // Make the same requests, and they should complete instantly.
   resource_tester_->MakeTestRequest(2, GURL("http://google.com/"));
   resource_tester_->MakeTestRequest(3, GURL("http://yahoo.com/"));
 
   EXPECT_TRUE(resource_tester_->IsRequestStarted(2));
   EXPECT_TRUE(resource_tester_->IsRequestComplete(2));
   EXPECT_TRUE(resource_tester_->IsRequestStarted(3));
   EXPECT_TRUE(resource_tester_->IsRequestComplete(3));
 }