diff options
Diffstat (limited to 'chrome/browser/webdata')
6 files changed, 14 insertions, 14 deletions
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc index 50eaba3..99d42c6 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc @@ -12,11 +12,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/webdata/autofill_table.h" -#include "chrome/browser/webdata/web_database.h" #include "chrome/browser/webdata/web_data_service.h" +#include "chrome/browser/webdata/web_database.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/guid.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc index d86da97..089e24c 100644 --- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc +++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/sync/internal_api/syncapi_mock.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/syncable/syncable_mock.h" -#include "chrome/browser/webdata/autofill_profile_syncable_service.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/webdata/autofill_change.h" +#include "chrome/browser/webdata/autofill_profile_syncable_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -111,7 +111,7 @@ class AutofillProfileSyncableServiceTest : public testing::Test { } protected: MessageLoop message_loop_; - BrowserThread db_thread_; + content::TestBrowserThread db_thread_; MockAutofillProfileSyncableService autofill_syncable_service_; scoped_ptr<MockSyncChangeProcessor> sync_processor_; }; diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 422fcfd..de709d5 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "sql/init_status.h" class AutofillChange; diff --git a/chrome/browser/webdata/web_data_service_test_util.h b/chrome/browser/webdata/web_data_service_test_util.h index faaffb6..0a3b2e5 100644 --- a/chrome/browser/webdata/web_data_service_test_util.h +++ b/chrome/browser/webdata/web_data_service_test_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/webdata/web_data_service.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" template <class T> class AutofillWebDataServiceConsumer: public WebDataServiceConsumer { diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 123fc71..d43d1b7 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -28,9 +28,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" #include "chrome/test/base/thread_observer_helper.h" -#include "content/browser/browser_thread.h" -#include "content/public/browser/notification_service.h" #include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/form_field.h" @@ -92,8 +92,8 @@ class WebDataServiceTest : public testing::Test { } MessageLoopForUI message_loop_; - BrowserThread ui_thread_; - BrowserThread db_thread_; + content::TestBrowserThread ui_thread_; + content::TestBrowserThread db_thread_; FilePath profile_dir_; scoped_refptr<WebDataService> wds_; ScopedTempDir temp_dir_; diff --git a/chrome/browser/webdata/web_database_migration_unittest.cc b/chrome/browser/webdata/web_database_migration_unittest.cc index dcd58e8..a9e4b9d 100644 --- a/chrome/browser/webdata/web_database_migration_unittest.cc +++ b/chrome/browser/webdata/web_database_migration_unittest.cc @@ -19,10 +19,10 @@ #include "chrome/browser/webdata/autofill_change.h" #include "chrome/browser/webdata/autofill_entry.h" #include "chrome/browser/webdata/web_database.h" -#include "content/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/guid.h" #include "chrome/test/base/ui_test_utils.h" +#include "content/test/test_browser_thread.h" #include "sql/statement.h" #include "testing/gtest/include/gtest/gtest.h" @@ -189,7 +189,7 @@ class WebDatabaseMigrationTest : public testing::Test { private: MessageLoopForUI message_loop_for_ui_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; ScopedTempDir temp_dir_; DISALLOW_COPY_AND_ASSIGN(WebDatabaseMigrationTest); |