Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/net/chrome_network_delegate_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/net/chrome_network_delegate.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/completion_callback.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ChromeNetworkDelegateTest : public testing::Test {
  protected:
   ChromeNetworkDelegateTest()
       : forwarder_(new extensions::EventRouterForwarder()) {
   }
@@ skipping 56 matching lines @@
   BooleanPrefMember pref_member_;
 };
 
 TEST_F(ChromeNetworkDelegateTest, NeverThrottleLogic) {
   NeverThrottleLogicImpl();
 }
 
 class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
  public:
   ChromeNetworkDelegateSafeSearchTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        io_thread_(content::BrowserThread::IO, &message_loop_),
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         forwarder_(new extensions::EventRouterForwarder()) {
   }
 
   virtual void SetUp() OVERRIDE {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
         &enable_referrers_, NULL, &force_google_safe_search_,
         profile_.GetTestingPrefService());
   }
 
  protected:
@@ skipping 24 matching lines @@
     net::TestURLRequest request(
         GURL(url_string), &delegate_, &context_, network_delegate_);
 
     request.Start();
     base::MessageLoop::current()->RunUntilIdle();
 
     EXPECT_EQ(expected_query_parameters, request.url().query());
   }
 
  private:
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
   TestingProfile profile_;
   BooleanPrefMember enable_referrers_;
   BooleanPrefMember force_google_safe_search_;
   scoped_ptr<net::URLRequest> request_;
   net::TestURLRequestContext context_;
   net::NetworkDelegate* network_delegate_;
   net::TestDelegate delegate_;
 };
 
@@ skipping 126 matching lines @@
 
   // Test the home page with parameters and safe set to active.
   CheckAddedParameters("http://google.com/search?q=google&safe=active",
                        "q=google&safe=active");
 }
 
 // Privacy Mode disables Channel Id if cookies are blocked (cr223191)
 class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
  public:
   ChromeNetworkDelegatePrivacyModeTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        io_thread_(content::BrowserThread::IO, &message_loop_),
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         forwarder_(new extensions::EventRouterForwarder()),
         cookie_settings_(CookieSettings::Factory::GetForProfile(&profile_)),
         kBlockedSite("http://ads.thirdparty.com"),
         kAllowedSite("http://good.allays.com"),
         kFirstPartySite("http://cool.things.com"),
         kBlockedFirstPartySite("http://no.thirdparties.com") {
   }
 
   virtual void SetUp() OVERRIDE {
     ChromeNetworkDelegate::InitializePrefsOnUIThread(
         &enable_referrers_, NULL, NULL,
         profile_.GetTestingPrefService());
   }
 
  protected:
   scoped_ptr<ChromeNetworkDelegate> CreateNetworkDelegate() {
     scoped_ptr<ChromeNetworkDelegate> network_delegate(
         new ChromeNetworkDelegate(forwarder_.get(), &enable_referrers_));
     network_delegate->set_cookie_settings(cookie_settings_);
     return network_delegate.Pass();
   }
 
   void SetDelegate(net::NetworkDelegate* delegate) {
     network_delegate_ = delegate;
     context_.set_network_delegate(network_delegate_);
   }
 
  protected:
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
   TestingProfile profile_;
   CookieSettings* cookie_settings_;
   BooleanPrefMember enable_referrers_;
   scoped_ptr<net::URLRequest> request_;
   net::TestURLRequestContext context_;
   net::NetworkDelegate* network_delegate_;
 
   const GURL kBlockedSite;
   const GURL kAllowedSite;
@@ skipping 51 matching lines @@
 
   cookie_settings_->SetCookieSetting(
       ContentSettingsPattern::FromURL(kBlockedFirstPartySite),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTING_BLOCK);
   // Privacy mode is disabled as kAllowedSite is still getting cookies
   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite,
                                                        kBlockedFirstPartySite));
 }