Remove explicit thread manipulation from WebDB migration test.

components/webdata/common/web_database_migration_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 <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/guid.h"
 #include "base/message_loop.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/webdata/autofill_change.h"
 #include "components/autofill/browser/webdata/autofill_entry.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
 #include "components/webdata/common/web_database.h"
-#include "content/public/test/test_browser_thread.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using autofill::AutofillProfile;
 using autofill::AutofillTable;
 using autofill::CreditCard;
 using base::Time;
-using content::BrowserThread;
 
 namespace {
 
 void AutofillProfile31FromStatement(const sql::Statement& s,
                                     AutofillProfile* profile,
                                     base::string16* label,
                                     int* unique_id,
                                     int64* date_modified) {
   DCHECK(profile);
   DCHECK(label);
@@ skipping 105 matching lines @@
 }
 
 }  // anonymous namespace
 
 // The WebDatabaseMigrationTest encapsulates testing of database migrations.
 // Specifically, these tests are intended to exercise any schema changes in
 // the WebDatabase and data migrations that occur in
 // |WebDatabase::MigrateOldVersionsAsNeeded()|.
 class WebDatabaseMigrationTest : public testing::Test {
  public:
-  // In order to access the application locale -- which the tested functions do
-  // internally -- this test must run on the UI thread.
-  // TODO(isherman): The WebDatabase code should probably verify that it is
-  // running on the DB thread.  Once that verification is added, this code will
-  // need to be updated to create both threads.
-  WebDatabaseMigrationTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_for_ui_) {}
+  WebDatabaseMigrationTest() {}
   virtual ~WebDatabaseMigrationTest() {}
 
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   // Load the database via the WebDatabase class and migrate the database to
   // the current version.
   void DoMigration() {
     // TODO(joi): This whole unit test file needs to stay in //chrome
@@ skipping 54 matching lines @@
   // The sql files located in "chrome/test/data/web_database" were generated by
   // launching the Chromium application prior to schema change, then using the
   // sqlite3 command-line application to dump the contents of the "Web Data"
   // database.
   // Like this:
   //   > .output version_nn.sql
   //   > .dump
   void LoadDatabase(const base::FilePath::StringType& file);
 
  private:
-  MessageLoopForUI message_loop_for_ui_;
-  content::TestBrowserThread ui_thread_;
   base::ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest);
 };
 
 const int WebDatabaseMigrationTest::kCurrentTestedVersionNumber = 49;
 
 void WebDatabaseMigrationTest::LoadDatabase(
     const base::FilePath::StringType& file) {
   std::string contents;
@@ skipping 1732 matching lines @@
     ASSERT_TRUE(sql::MetaTable::DoesTableExist(&connection));
 
     // Check version.
     EXPECT_EQ(kCurrentTestedVersionNumber, VersionFromConnection(&connection));
 
     // A new column should have been created.
     EXPECT_TRUE(connection.DoesColumnExist("keywords",
                                            "search_terms_replacement_key"));
   }
 }