Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/extensions/activity_log/activity_log_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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/activity_log/dom_actions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/dom_action_types.h"
 #include "chrome/common/extensions/extension_builder.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 namespace {
 
 const char kExtensionId[] = "abc";
 
 }  // namespace
 
 namespace extensions {
 
 class ActivityLogTest : public testing::Test {
- public:
+ protected:
   ActivityLogTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        db_thread_(BrowserThread::DB, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        io_thread_(BrowserThread::IO, &message_loop_),
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         saved_cmdline_(CommandLine::NO_PROGRAM) {
-  }
-
-  virtual void SetUp() OVERRIDE {
+#if defined OS_CHROMEOS
+  test_user_manager_.reset(new chromeos::ScopedTestUserManager());
+#endif
     CommandLine command_line(CommandLine::NO_PROGRAM);
     saved_cmdline_ = *CommandLine::ForCurrentProcess();
     profile_.reset(new TestingProfile());
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogging);
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogTesting);
     ActivityLog::RecomputeLoggingIsEnabled();
     extension_service_ = static_cast<TestExtensionSystem*>(
             ExtensionSystem::Get(profile_.get()))->CreateExtensionService(
                 &command_line, base::FilePath(), false);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual ~ActivityLogTest() {
+#if defined OS_CHROMEOS
+    test_user_manager_.reset();
+#endif
     base::RunLoop().RunUntilIdle();
     profile_.reset(NULL);
-    base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        base::MessageLoop::QuitClosure(),
-        base::TimeDelta::FromSeconds(4));   // Don't hang on failure.
-    base::RunLoop().RunUntilIdle();
-
     // Restore the original command line and undo the affects of SetUp().
     *CommandLine::ForCurrentProcess() = saved_cmdline_;
     ActivityLog::RecomputeLoggingIsEnabled();
   }
 
   static void RetrieveActions_LogAndFetchActions(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     ASSERT_EQ(2, static_cast<int>(i->size()));
   }
 
@@ skipping 12 matching lines @@
     std::string id(kExtensionId);
     std::string args = "ID: " + id + ", CATEGORY: "
       "CALL, API: extension.connect, ARGS: \"hello\", \"world\"";
     ASSERT_EQ(args, last->PrintForDebug());
   }
 
  protected:
   scoped_ptr<TestingProfile> profile_;
   ExtensionService* extension_service_;
 
- private:
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread db_thread_;
-  content::TestBrowserThread file_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   // Used to preserve a copy of the original command line.
   // The test framework will do this itself as well. However, by then,
   // it is too late to call ActivityLog::RecomputeLoggingIsEnabled() in
   // TearDown().
   CommandLine saved_cmdline_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
-  chromeos::ScopedTestUserManager test_user_manager_;
+  scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 };
 
 TEST_F(ActivityLogTest, Enabled) {
   ASSERT_TRUE(ActivityLog::IsLogEnabled());
 }
 
 TEST_F(ActivityLogTest, Construct) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
@@ skipping 63 matching lines @@
   activity_log->LogAPIAction(kExtensionId,
                              std::string("extension.connect"),
                              args.get(),
                              std::string());
   activity_log->GetActions(
       kExtensionId, 0, base::Bind(ActivityLogTest::Arguments_Present));
 }
 
 }  // namespace extensions