diff options
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r-- | chrome/browser/prefs/pref_member.h | 2 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_member_unittest.cc | 6 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_service.cc | 2 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_service_mock_builder.cc | 2 | ||||
-rw-r--r-- | chrome/browser/prefs/pref_value_store.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h index fa085e8..5775db3 100644 --- a/chrome/browser/prefs/pref_member.h +++ b/chrome/browser/prefs/pref_member.h @@ -31,7 +31,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/values.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" class PrefService; diff --git a/chrome/browser/prefs/pref_member_unittest.cc b/chrome/browser/prefs/pref_member_unittest.cc index bb5080b..15c5a21 100644 --- a/chrome/browser/prefs/pref_member_unittest.cc +++ b/chrome/browser/prefs/pref_member_unittest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_pref_service.h" -#include "content/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -240,8 +240,8 @@ TEST(PrefMemberTest, MoveToThread) { scoped_refptr<GetPrefValueCallback> callback = make_scoped_refptr(new GetPrefValueCallback()); MessageLoop message_loop; - BrowserThread ui_thread(BrowserThread::UI, &message_loop); - BrowserThread io_thread(BrowserThread::IO); + content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::TestBrowserThread io_thread(BrowserThread::IO); ASSERT_TRUE(io_thread.Start()); RegisterTestPrefs(&prefs); callback->Init(kBoolPref, &prefs); diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 3a48b43..5ab4651 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -30,7 +30,7 @@ #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/common/json_pref_store.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc index 09fca07..133609f 100644 --- a/chrome/browser/prefs/pref_service_mock_builder.cc +++ b/chrome/browser/prefs/pref_service_mock_builder.cc @@ -10,7 +10,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/json_pref_store.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" PrefServiceMockBuilder::PrefServiceMockBuilder() : user_prefs_(new TestingPrefStore) { diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h index 142f906..a9763b8 100644 --- a/chrome/browser/prefs/pref_value_store.h +++ b/chrome/browser/prefs/pref_value_store.h @@ -15,7 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/common/pref_store.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" class FilePath; class PrefModelAssociator; |