Commit 8d025dbd authored by isherman@chromium.org's avatar isherman@chromium.org

Remove explicit thread manipulation from WebDB migration test.

BUG=none

Review URL: https://chromiumcodereview.appspot.com/13935005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194757 0039d316-1c4b-4281-b951-d872f2087c98
parent 1577d12e
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "components/autofill/browser/webdata/autofill_entry.h" #include "components/autofill/browser/webdata/autofill_entry.h"
#include "components/autofill/browser/webdata/autofill_table.h" #include "components/autofill/browser/webdata/autofill_table.h"
#include "components/webdata/common/web_database.h" #include "components/webdata/common/web_database.h"
#include "content/public/test/test_browser_thread.h"
#include "sql/statement.h" #include "sql/statement.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -36,7 +35,6 @@ using autofill::AutofillProfile; ...@@ -36,7 +35,6 @@ using autofill::AutofillProfile;
using autofill::AutofillTable; using autofill::AutofillTable;
using autofill::CreditCard; using autofill::CreditCard;
using base::Time; using base::Time;
using content::BrowserThread;
namespace { namespace {
...@@ -162,13 +160,7 @@ void CheckNoBackupData(const sql::Connection& connection, ...@@ -162,13 +160,7 @@ void CheckNoBackupData(const sql::Connection& connection,
// |WebDatabase::MigrateOldVersionsAsNeeded()|. // |WebDatabase::MigrateOldVersionsAsNeeded()|.
class WebDatabaseMigrationTest : public testing::Test { class WebDatabaseMigrationTest : public testing::Test {
public: public:
// In order to access the application locale -- which the tested functions do WebDatabaseMigrationTest() {}
// 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_) {}
virtual ~WebDatabaseMigrationTest() {} virtual ~WebDatabaseMigrationTest() {}
virtual void SetUp() { virtual void SetUp() {
...@@ -243,8 +235,6 @@ class WebDatabaseMigrationTest : public testing::Test { ...@@ -243,8 +235,6 @@ class WebDatabaseMigrationTest : public testing::Test {
void LoadDatabase(const base::FilePath::StringType& file); void LoadDatabase(const base::FilePath::StringType& file);
private: private:
MessageLoopForUI message_loop_for_ui_;
content::TestBrowserThread ui_thread_;
base::ScopedTempDir temp_dir_; base::ScopedTempDir temp_dir_;
DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest); DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment