Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

components/autofill/browser/autofill_external_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 <vector>
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/test_autofill_external_delegate.h"
 #include "components/autofill/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/password_form_fill_data.h"
-#include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/gfx/rect.h"
 
-using content::BrowserThread;
 using testing::_;
 using WebKit::WebAutofillClient;
 
 namespace autofill {
 
 namespace {
 
 // A constant value to use as the Autofill query ID.
 const int kQueryId = 5;
 
@@ skipping 50 matching lines @@
                     int unique_id));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillManager);
 };
 
 }  // namespace
 
 class AutofillExternalDelegateUnitTest
     : public ChromeRenderViewHostTestHarness {
- public:
-  AutofillExternalDelegateUnitTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_) {}
-  virtual ~AutofillExternalDelegateUnitTest() {}
-
  protected:
-  // Issue an OnQuery call with the given |query_id|.
-  void IssueOnQuery(int query_id) {
-    const FormData form;
-    FormFieldData field;
-    field.is_focusable = true;
-    field.should_autocomplete = true;
-    const gfx::RectF element_bounds;
-
-    external_delegate_->OnQuery(query_id, form, field, element_bounds, false);
-  }
-
-  MockAutofillManagerDelegate manager_delegate_;
-  scoped_ptr<MockAutofillManager> autofill_manager_;
-  scoped_ptr<testing::NiceMock<MockAutofillExternalDelegate> >
-      external_delegate_;
-
- private:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     autofill_manager_.reset(
         new MockAutofillManager(web_contents(), &manager_delegate_));
     external_delegate_.reset(
         new testing::NiceMock<MockAutofillExternalDelegate>(
             web_contents(),
             autofill_manager_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed. Also, a real
     // AutofillManager is tied to the lifetime of the WebContents, so it must
     // be destroyed at the destruction of the WebContents.
     autofill_manager_.reset();
     external_delegate_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
-  content::TestBrowserThread ui_thread_;
+  // Issue an OnQuery call with the given |query_id|.
+  void IssueOnQuery(int query_id) {
+    const FormData form;
+    FormFieldData field;
+    field.is_focusable = true;
+    field.should_autocomplete = true;
+    const gfx::RectF element_bounds;
 
-  DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegateUnitTest);
+    external_delegate_->OnQuery(query_id, form, field, element_bounds, false);
+  }
+
+  MockAutofillManagerDelegate manager_delegate_;
+  scoped_ptr<MockAutofillManager> autofill_manager_;
+  scoped_ptr<testing::NiceMock<MockAutofillExternalDelegate> >
+      external_delegate_;
 };
 
 // Test that our external delegate called the virtual methods at the right time.
 TEST_F(AutofillExternalDelegateUnitTest, TestExternalDelegateVirtualCalls) {
   IssueOnQuery(kQueryId);
 
   // The enums must be cast to ints to prevent compile errors on linux_rel.
   EXPECT_CALL(manager_delegate_,
               ShowAutofillPopup(
                   _, _, _, _,
@@ skipping 184 matching lines @@
   EXPECT_CALL(manager_delegate_, HideAutofillPopup());
 
   external_delegate_->OnSuggestionsReturned(kQueryId,
                                             autofill_items,
                                             autofill_items,
                                             autofill_items,
                                             autofill_ids);
 }
 
 }  // namespace autofill