diff options
Diffstat (limited to 'chrome')
10 files changed, 34 insertions, 32 deletions
diff --git a/chrome/browser/autofill/personal_data_manager.cc b/chrome/browser/autofill/personal_data_manager.cc index 8fc91c2..87600f3 100644 --- a/chrome/browser/autofill/personal_data_manager.cc +++ b/chrome/browser/autofill/personal_data_manager.cc @@ -591,7 +591,7 @@ const std::vector<AutoFillProfile*>& PersonalDataManager::web_profiles() { AutoFillProfile* PersonalDataManager::CreateNewEmptyAutoFillProfileForDBThread( const string16& label) { // See comment in header for thread details. - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); AutoLock lock(unique_ids_lock_); AutoFillProfile* p = new AutoFillProfile(label, CreateNextUniqueIDFor(&unique_profile_ids_)); diff --git a/chrome/browser/autofill/personal_data_manager_unittest.cc b/chrome/browser/autofill/personal_data_manager_unittest.cc index 5453c5f..2d151f2 100644 --- a/chrome/browser/autofill/personal_data_manager_unittest.cc +++ b/chrome/browser/autofill/personal_data_manager_unittest.cc @@ -28,7 +28,7 @@ using webkit_glue::FormData; ACTION(QuitUIMessageLoop) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); MessageLoop::current()->Quit(); } @@ -43,8 +43,8 @@ class PersonalDataLoadedObserverMock : public PersonalDataManager::Observer { class PersonalDataManagerTest : public testing::Test { protected: PersonalDataManagerTest() - : ui_thread_(ChromeThread::UI, &message_loop_), - db_thread_(ChromeThread::DB) { + : ui_thread_(BrowserThread::UI, &message_loop_), + db_thread_(BrowserThread::DB) { } virtual void SetUp() { @@ -80,8 +80,8 @@ class PersonalDataManagerTest : public testing::Test { } MessageLoopForUI message_loop_; - ChromeThread ui_thread_; - ChromeThread db_thread_; + BrowserThread ui_thread_; + BrowserThread db_thread_; scoped_ptr<TestingProfile> profile_; scoped_refptr<PersonalDataManager> personal_data_; NotificationRegistrar registrar_; diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index 8ef7362..1a909f2 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -36,8 +36,8 @@ class TestingPageNavigator : public PageNavigator { class BookmarkContextMenuControllerTest : public testing::Test { public: BookmarkContextMenuControllerTest() - : ui_thread_(ChromeThread::UI, &message_loop_), - file_thread_(ChromeThread::FILE, &message_loop_), + : ui_thread_(BrowserThread::UI, &message_loop_), + file_thread_(BrowserThread::FILE, &message_loop_), model_(NULL) { } @@ -67,8 +67,8 @@ class BookmarkContextMenuControllerTest : public testing::Test { protected: MessageLoopForUI message_loop_; - ChromeThread ui_thread_; - ChromeThread file_thread_; + BrowserThread ui_thread_; + BrowserThread file_thread_; scoped_ptr<TestingProfile> profile_; BookmarkModel* model_; TestingPageNavigator navigator_; diff --git a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc index 434a537..833c7d3 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc @@ -18,13 +18,13 @@ class BookmarkDragDataTest : public testing::Test { public: BookmarkDragDataTest() - : ui_thread_(ChromeThread::UI, &loop_), - file_thread_(ChromeThread::FILE, &loop_) { } + : ui_thread_(BrowserThread::UI, &loop_), + file_thread_(BrowserThread::FILE, &loop_) { } private: MessageLoop loop_; - ChromeThread ui_thread_; - ChromeThread file_thread_; + BrowserThread ui_thread_; + BrowserThread file_thread_; }; namespace { diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 8631c1a..5e90c18 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -418,7 +418,7 @@ void BookmarkFaviconFetcher::ExecuteWriter() { // for the duration of the write), as such we make a copy of the // BookmarkModel using BookmarkCodec then write from that. BookmarkCodec codec; - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, new Writer(codec.Encode(profile_->GetBookmarkModel()), path_, favicons_map_.release(), diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 5789449..db22f10 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -143,8 +143,8 @@ class BookmarksObserver : public BookmarksExportObserver { // way of bookmark_html_writer, then using the importer to read it back in. TEST_F(BookmarkHTMLWriterTest, Test) { MessageLoop message_loop; - ChromeThread fake_ui_thread(ChromeThread::UI, &message_loop); - ChromeThread fake_file_thread(ChromeThread::FILE, &message_loop); + BrowserThread fake_ui_thread(BrowserThread::UI, &message_loop); + BrowserThread fake_file_thread(BrowserThread::FILE, &message_loop); TestingProfile profile; profile.CreateHistoryService(true, false); diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index 94a2e16..9decbd7 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -222,8 +222,8 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) { // This ensures MessageLoop::current() will exist, which is needed by // TestingProfile::BlockUntilHistoryProcessesPendingRequests(). MessageLoop loop(MessageLoop::TYPE_DEFAULT); - ChromeThread ui_thread(ChromeThread::UI, &loop); - ChromeThread file_thread(ChromeThread::FILE, &loop); + BrowserThread ui_thread(BrowserThread::UI, &loop); + BrowserThread file_thread(BrowserThread::FILE, &loop); TestingProfile profile; profile.CreateHistoryService(true, false); diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index 0bf7534..0286138 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -649,8 +649,8 @@ class BookmarkModelTestWithProfile : public testing::Test, public BookmarkModelObserver { public: BookmarkModelTestWithProfile() - : ui_thread_(ChromeThread::UI, &message_loop_), - file_thread_(ChromeThread::FILE, &message_loop_) {} + : ui_thread_(BrowserThread::UI, &message_loop_), + file_thread_(BrowserThread::FILE, &message_loop_) {} virtual void SetUp() { } @@ -742,8 +742,8 @@ class BookmarkModelTestWithProfile : public testing::Test, const BookmarkNode* node) {} MessageLoopForUI message_loop_; - ChromeThread ui_thread_; - ChromeThread file_thread_; + BrowserThread ui_thread_; + BrowserThread file_thread_; }; // Creates a set of nodes in the bookmark bar model, then recreates the diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc index 6cfe003..870592c 100644 --- a/chrome/browser/bookmarks/bookmark_storage.cc +++ b/chrome/browser/bookmarks/bookmark_storage.cc @@ -99,8 +99,8 @@ class BookmarkStorage::LoadTask : public Task { } } - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( storage_.get(), &BookmarkStorage::OnLoadFinished, bookmark_file_exists, path_)); @@ -147,12 +147,12 @@ BookmarkStorage::BookmarkStorage(Profile* profile, BookmarkModel* model) : profile_(profile), model_(model), writer_(profile->GetPath().Append(chrome::kBookmarksFileName), - ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)), tmp_history_path_( profile->GetPath().Append(chrome::kHistoryBookmarksFileName)) { writer_.set_commit_interval(base::TimeDelta::FromMilliseconds(kSaveDelayMS)); - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, new BackupTask(writer_.path())); + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, new BackupTask(writer_.path())); } BookmarkStorage::~BookmarkStorage() { @@ -168,8 +168,8 @@ void BookmarkStorage::LoadBookmarks(BookmarkLoadDetails* details) { } void BookmarkStorage::DoLoadBookmarks(const FilePath& path) { - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, new LoadTask(path, this, details_.get())); + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, new LoadTask(path, this, details_.get())); } void BookmarkStorage::MigrateFromHistory() { @@ -244,8 +244,8 @@ void BookmarkStorage::OnLoadFinished(bool file_exists, const FilePath& path) { SaveNow(); // Clean up after migration from history. - ChromeThread::PostTask( - ChromeThread::FILE, FROM_HERE, new FileDeleteTask(tmp_history_path_)); + BrowserThread::PostTask( + BrowserThread::FILE, FROM_HERE, new FileDeleteTask(tmp_history_path_)); } } diff --git a/chrome/browser/chrome_thread.h b/chrome/browser/chrome_thread.h index 4bb9387..475d9f7 100644 --- a/chrome/browser/chrome_thread.h +++ b/chrome/browser/chrome_thread.h @@ -206,4 +206,6 @@ class ChromeThread : public base::Thread { static ChromeThread* chrome_threads_[ID_COUNT]; }; +typedef ChromeThread BrowserThread; + #endif // CHROME_BROWSER_CHROME_THREAD_H_ |