Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

chrome/browser/ui/autofill/autofill_dialog_controller_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 "base/guid.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
+#include "base/run_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_metrics.h"
 #include "components/autofill/browser/test_personal_data_manager.h"
 #include "components/autofill/browser/wallet/full_wallet.h"
 #include "components/autofill/browser/wallet/instrument.h"
 #include "components/autofill/browser/wallet/wallet_address.h"
 #include "components/autofill/browser/wallet/wallet_client.h"
 #include "components/autofill/browser/wallet/wallet_test_util.h"
 #include "components/autofill/common/form_data.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 using testing::_;
 
 namespace autofill {
 
 namespace {
 
 const char kFakeEmail[] = "user@example.com";
 const char kEditedBillingAddress[] = "123 edited billing address";
 const char* kFieldsFromPage[] = { "email", "cc-number", "billing region",
   "shipping region" };
 const char kSettingsOrigin[] = "Chrome settings";
 
-using content::BrowserThread;
-
 class TestAutofillDialogView : public AutofillDialogView {
  public:
   TestAutofillDialogView() {}
   virtual ~TestAutofillDialogView() {}
 
   virtual void Show() OVERRIDE {}
   virtual void Hide() OVERRIDE {}
   virtual void UpdateNotificationArea() OVERRIDE {}
   virtual void UpdateAccountChooser() OVERRIDE {}
   virtual void UpdateButtonStrip() OVERRIDE {}
@@ skipping 170 matching lines @@
   const AutofillMetrics& metric_logger_;
   TestPersonalDataManager test_manager_;
   testing::NiceMock<TestWalletClient> test_wallet_client_;
   bool is_first_run_;
   GURL open_tab_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
 class AutofillDialogControllerTest : public testing::Test {
- public:
-  AutofillDialogControllerTest()
-    : ui_thread_(BrowserThread::UI, &loop_),
-      file_thread_(BrowserThread::FILE),
-      file_blocking_thread_(BrowserThread::FILE_USER_BLOCKING),
-      io_thread_(BrowserThread::IO) {
-    file_thread_.Start();
-    file_blocking_thread_.Start();
-    io_thread_.StartIOThread();
-  }
-
-  virtual ~AutofillDialogControllerTest() {}
-
+ protected:
   // testing::Test implementation:
   virtual void SetUp() OVERRIDE {
     FormData form_data;
     for (size_t i = 0; i < arraysize(kFieldsFromPage); ++i) {
       FormFieldData field;
       field.autocomplete_attribute = kFieldsFromPage[i];
       form_data.fields.push_back(field);
     }
 
     profile()->CreateRequestContext();
@@ skipping 66 matching lines @@
   TestingProfile* profile() { return &profile_; }
 
   const FormStructure* form_structure() { return form_structure_; }
 
  private:
   void FinishedCallback(const FormStructure* form_structure,
                         const std::string& google_transaction_id) {
     form_structure_ = form_structure;
   }
 
+  // Must be first member to ensure TestBrowserThreads outlive other objects.
+  content::TestBrowserThreadBundle thread_bundle_;
+
 #if defined(OS_WIN)
    // http://crbug.com/227221
    ui::ScopedOleInitializer ole_initializer_;
 #endif
 
-  // A bunch of threads are necessary for classes like TestWebContents and
-  // URLRequestContextGetter not to fall over.
-  base::MessageLoopForUI loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
-  content::TestBrowserThread file_blocking_thread_;
-  content::TestBrowserThread io_thread_;
   TestingProfile profile_;
 
   // The controller owns itself.
   base::WeakPtr<TestAutofillDialogController> controller_;
 
   scoped_ptr<content::WebContents> test_web_contents_;
 
   // Must outlive the controller.
   AutofillMetrics metric_logger_;
 
   // Returned when the dialog closes successfully.
   const FormStructure* form_structure_;
-
-  DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerTest);

[Ilya Sherman, 2013/05/20 21:38:49]

Why did you remove this?  I see in your CL description "removes problematic
DISALLOW_COPY_AND_ASSIGNS in tests" -- could you explain why these are
problematic?  Thanks.

[awong, 2013/05/20 21:57:56]

Replied on main thread and added explanation to the CL description.  Basically,
DISALLOW_COPY_AND_ASSIGN() in a GoogleTest fixture forces you to also have to
declare a default constructor which is just extra code.

[Ilya Sherman, 2013/05/20 22:33:01]

Ok, thanks for the explanation -- makes sense :)

 };
 
 }  // namespace
 
 // This test makes sure nothing falls over when fields are being validity-
 // checked.
 TEST_F(AutofillDialogControllerTest, ValidityCheck) {
   const DialogSection sections[] = {
     SECTION_EMAIL,
     SECTION_CC,
@@ skipping 792 matching lines @@
   EXPECT_FALSE(controller()->ShouldOfferToSaveInChrome());
 
   controller()->MenuModelForSection(SECTION_EMAIL)->ActivatedAt(1);
   EXPECT_TRUE(controller()->ShouldOfferToSaveInChrome());
 
   profile()->set_incognito(true);
   EXPECT_FALSE(controller()->ShouldOfferToSaveInChrome());
 }
 
 }  // namespace autofill