Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/ui/website_settings/website_settings_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/ui/website_settings/website_settings.h"
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
-#include "content/public/test/test_browser_thread.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/test/test_certificate_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::SSLStatus;
-using namespace testing;
+using testing::_;
+using testing::AnyNumber;
+using testing::Return;
+using testing::SetArgPointee;
 
 namespace {
 
 // SSL cipher suite like specified in RFC5246 Appendix A.5. "The Cipher Suite".
 // Without the CR_ prefix, this clashes with the OS X 10.8 headers.
 int CR_TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x3D;
 
 int SetSSLVersion(int connection_status, int version) {
   // Clear SSL version bits (Bits 20, 21 and 22).
   connection_status &=
@@ skipping 25 matching lines @@
   MOCK_METHOD1(SetFirstVisit, void(const string16& first_visit));
   MOCK_METHOD1(SetSelectedTab, void(TabId tab_id));
 };
 
 class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
   WebsiteSettingsTest()
       : website_settings_(NULL),
         mock_ui_(NULL),
         cert_id_(0),
-        browser_thread_(content::BrowserThread::UI, &message_loop_),
         url_("http://www.example.com") {
   }
 
   virtual ~WebsiteSettingsTest() {
   }
 
   virtual void SetUp() {
     ChromeRenderViewHostTestHarness::SetUp();
     // Setup stub SSLStatus.
     ssl_.security_style = content::SECURITY_STYLE_UNAUTHENTICATED;
@@ skipping 56 matching lines @@
     return website_settings_.get();
   }
 
   SSLStatus ssl_;
 
  private:
   scoped_ptr<WebsiteSettings> website_settings_;
   scoped_ptr<MockWebsiteSettingsUI> mock_ui_;
   int cert_id_;
   scoped_refptr<net::X509Certificate> cert_;
-  content::TestBrowserThread browser_thread_;
   MockCertStore cert_store_;
   GURL url_;
 };
 
 }  // namespace
 
 TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
   // Setup site permissions.
   HostContentSettingsMap* content_settings =
       profile()->GetHostContentSettingsMap();
@@ skipping 228 matching lines @@
       CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
   website_settings()->OnUIClosing();
   EXPECT_EQ(1u, infobar_service()->infobar_count());
 
   // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete
   // it. Hence the |delegate| must be cleaned up after it was removed from the
   // |infobar_service|.
   scoped_ptr<InfoBarDelegate> delegate(infobar_service()->infobar_at(0));
   infobar_service()->RemoveInfoBar(delegate.get());
 }