Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/extensions/api/declarative_webrequest/webrequest_action_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 "chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/test/values_test_util.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_test_util.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using extension_test_util::LoadManifestUnchecked;
 using testing::HasSubstr;
 
@@ skipping 28 matching lines @@
   return action_set.Pass();
 }
 
 }  // namespace
 
 namespace keys = declarative_webrequest_constants;
 
 class WebRequestActionWithThreadsTest : public testing::Test {
  public:
   WebRequestActionWithThreadsTest()
-      : io_thread_(content::BrowserThread::IO, &message_loop_) {}
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
 
  protected:
   virtual void SetUp() OVERRIDE;
 
   // Creates a URL request for URL |url_string|, and applies the actions from
   // |action_set| as if they were triggered by the extension with
   // |extension_id| during |stage|.
   bool ActionWorksOnRequest(const char* url_string,
                             const std::string& extension_id,
                             const WebRequestActionSet* action_set,
                             RequestStage stage);
 
   // Expects a JSON description of an |action| requiring <all_urls> host
   // permission, and checks that only an extensions with full host permissions
   // can execute that action at |stage|. Also checks that the action is not
   // executable for http://clients1.google.com.
   void CheckActionNeedsAllUrls(const char* action, RequestStage stage);
 
   net::TestURLRequestContext context_;
 
   // An extension with *.com host permissions and the DWR permission.
   scoped_refptr<Extension> extension_;
   // An extension with host permissions for all URLs and the DWR permission.
   scoped_refptr<Extension> extension_all_urls_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
  private:
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 };
 
 void WebRequestActionWithThreadsTest::SetUp() {
   testing::Test::SetUp();
 
   std::string error;
   extension_ = LoadManifestUnchecked("permissions",
                                      "web_request_com_host_permissions.json",
                                      Manifest::INVALID_LOCATION,
                                      Extension::NO_FLAGS,
@@ skipping 453 matching lines @@
   for (WebRequestActionSet::Actions::const_iterator it =
            action_set->actions().begin();
        it != action_set->actions().end();
        ++it) {
     EXPECT_EQ(kExpectedNames[index], (*it)->GetName());
     ++index;
   }
 }
 
 }  // namespace extensions