Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

components/autofill/browser/autofill_manager_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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 25 matching lines @@
 #include "components/autofill/browser/personal_data_manager.h"
 #include "components/autofill/browser/test_autofill_external_delegate.h"
 #include "components/autofill/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/common/autofill_messages.h"
 #include "components/autofill/common/form_data.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/forms_seen_state.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
-#include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "grit/component_resources.h"
 #include "ipc/ipc_test_sink.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 "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 
-using content::BrowserThread;
 using content::WebContents;
 using testing::_;
 using WebKit::WebFormElement;
 
 namespace autofill {
 
 typedef PersonalDataManager::GUIDPair GUIDPair;
 
 namespace {
 
@@ skipping 480 matching lines @@
                                                  load_time,
                                                  interaction_time,
                                                  submission_time);
   }
 
   virtual void OnMaybeShowAutocheckoutBubble(
       const FormData& form,
       const gfx::RectF& bounding_box) OVERRIDE {
     AutofillManager::OnMaybeShowAutocheckoutBubble(form, bounding_box);
     // Needed for AutocheckoutManager to post task on IO thread.
-    content::RunAllPendingInMessageLoop(BrowserThread::IO);
+    content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
   }
 
   // Resets the MessageLoopRunner so that it can wait for an asynchronous form
   // submission to complete.
   void ResetMessageLoopRunner() {
     message_loop_runner_ = new content::MessageLoopRunner();
   }
 
   // Wait for the asynchronous OnFormSubmitted() call to complete.
   void WaitForAsyncFormSubmit() {
@@ skipping 73 matching lines @@
   std::string submitted_form_signature_;
   std::vector<FieldTypeSet> expected_submitted_field_types_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillManager);
 };
 
 }  // namespace
 
 class AutofillManagerTest : public ChromeRenderViewHostTestHarness {
  public:
-  AutofillManagerTest()
-      : ChromeRenderViewHostTestHarness(),
-        ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE),
-        io_thread_(BrowserThread::IO) {
-  }
-
-  virtual ~AutofillManagerTest() {
-  }
-
   virtual void SetUp() OVERRIDE {
     TestingProfile* profile = CreateProfile();
     profile->CreateRequestContext();
     browser_context_.reset(profile);
     autofill::PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
         profile, TestPersonalDataManager::Build);
 
     ChromeRenderViewHostTestHarness::SetUp();
-    io_thread_.StartIOThread();
 
     autofill::TabAutofillManagerDelegate::CreateForWebContents(web_contents());
 
     personal_data_.SetBrowserContext(profile);
     autofill_manager_.reset(new TestAutofillManager(
         web_contents(),
         autofill::TabAutofillManagerDelegate::FromWebContents(web_contents()),
         &personal_data_));
-
-    file_thread_.Start();
   }
 
   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();
-    file_thread_.Stop();
     ChromeRenderViewHostTestHarness::TearDown();
-    io_thread_.Stop();
 
     // Remove the BrowserContext so TestPersonalDataManager does not need to
     // care about removing self as an observer in destruction.
     personal_data_.SetBrowserContext(NULL);
   }
 
   virtual TestingProfile* CreateProfile() {
     return new TestingProfile();
   }
 
@@ skipping 96 matching lines @@
     if (page_id)
       *page_id = autofill_param.a;
     if (results)
       *results = autofill_param.b;
 
     process()->sink().ClearMessages();
     return true;
   }
 
  protected:
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
-  content::TestBrowserThread io_thread_;
-
   scoped_ptr<TestAutofillManager> autofill_manager_;
   TestPersonalDataManager personal_data_;
 
   // Used when we want an off the record profile. This will store the original
   // profile from which the off the record profile is derived.
   scoped_ptr<Profile> other_browser_context_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AutofillManagerTest);
 };
 
 class TestFormStructure : public FormStructure {
  public:
   explicit TestFormStructure(const FormData& form)
       : FormStructure(form, std::string()) {}
   virtual ~TestFormStructure() {}
 
   void SetFieldTypes(const std::vector<AutofillFieldType>& heuristic_types,
                      const std::vector<AutofillFieldType>& server_types) {
@@ skipping 2472 matching lines @@
   CreateTestAddressFormData(&form);
   std::vector<FormData> forms(1, form);
   FormsSeen(forms);
   const FormFieldData& field = form.fields[0];
   GetAutofillSuggestions(form, field);  // should call the delegate's OnQuery()
 
   autofill_manager_->SetExternalDelegate(NULL);
 }
 
 }  // namespace autofill