diff options
21 files changed, 93 insertions, 93 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 34eac8b..4fa1e9d 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -495,8 +495,8 @@ void TaskManagerModel::StartUpdating() { // Register jobs notifications so we can compute network usage (it must be // done from the IO thread). - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &TaskManagerModel::RegisterForJobDoneNotifications)); @@ -518,8 +518,8 @@ void TaskManagerModel::StopUpdating() { } // Unregister jobs notification (must be done from the IO thread). - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &TaskManagerModel::UnregisterForJobDoneNotifications)); } @@ -844,8 +844,8 @@ void TaskManagerModel::OnBytesRead(URLRequestJob* job, const char* buf, // This happens in the IO thread, post it to the UI thread. int origin_child_id = chrome_browser_net::GetOriginProcessUniqueIDForRequest(job->request()); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &TaskManagerModel::BytesRead, diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 3ba38ce..2f606ba 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -391,8 +391,8 @@ void TaskManagerChildProcessResourceProvider::StartUpdating() { NotificationService::AllSources()); // Get the existing child processes. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( this, &TaskManagerChildProcessResourceProvider::RetrieveChildProcessInfo)); @@ -496,8 +496,8 @@ void TaskManagerChildProcessResourceProvider::RetrieveChildProcessInfo() { } // Now notify the UI thread that we have retrieved information about child // processes. - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &TaskManagerChildProcessResourceProvider::ChildProcessInfoRetreived)); } diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 2197fd2..e48f579 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -327,7 +327,7 @@ BrowserThemePack::~BrowserThemePack() { // static BrowserThemePack* BrowserThemePack::BuildFromExtension(Extension* extension) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(extension); DCHECK(extension->is_theme()); @@ -366,7 +366,7 @@ BrowserThemePack* BrowserThemePack::BuildFromExtension(Extension* extension) { // static scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack( FilePath path, const std::string& expected_id) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); scoped_refptr<BrowserThemePack> pack = new BrowserThemePack; pack->data_pack_.reset(new base::DataPack); @@ -418,7 +418,7 @@ scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack( } bool BrowserThemePack::WriteToDisk(FilePath path) const { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); // Add resources for each of the property arrays. RawDataForWriting resources; resources[kHeaderID] = base::StringPiece( @@ -991,7 +991,7 @@ void BrowserThemePack::GenerateTabBackgroundImages(ImageCache* bitmaps) const { void BrowserThemePack::RepackImages(const ImageCache& images, RawImages* reencoded_images) const { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); for (ImageCache::const_iterator it = images.begin(); it != images.end(); ++it) { std::vector<unsigned char> image_data; @@ -1019,7 +1019,7 @@ void BrowserThemePack::MergeImageCaches( void BrowserThemePack::AddRawImagesTo(const RawImages& images, RawDataForWriting* out) const { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); for (RawImages::const_iterator it = images.begin(); it != images.end(); ++it) { (*out)[it->first] = base::StringPiece( diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 9fae131..2ff05bd 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -22,8 +22,8 @@ class BrowserThemePackTest : public ::testing::Test { public: BrowserThemePackTest() : message_loop(), - fake_ui_thread(ChromeThread::UI, &message_loop), - fake_file_thread(ChromeThread::FILE, &message_loop), + fake_ui_thread(BrowserThread::UI, &message_loop), + fake_file_thread(BrowserThread::FILE, &message_loop), theme_pack_(new BrowserThemePack) { } @@ -191,8 +191,8 @@ class BrowserThemePackTest : public ::testing::Test { } MessageLoop message_loop; - ChromeThread fake_ui_thread; - ChromeThread fake_file_thread; + BrowserThread fake_ui_thread; + BrowserThread fake_file_thread; scoped_refptr<BrowserThemePack> theme_pack_; }; diff --git a/chrome/browser/themes/browser_theme_provider.cc b/chrome/browser/themes/browser_theme_provider.cc index 5f91370..8910637 100644 --- a/chrome/browser/themes/browser_theme_provider.cc +++ b/chrome/browser/themes/browser_theme_provider.cc @@ -610,8 +610,8 @@ void BrowserThemeProvider::BuildFromExtension(Extension* extension) { // Write the packed file to disk. FilePath pack_path = extension->path().Append(chrome::kThemePackFilename); - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, - new WritePackToDiskTask(pack, pack_path)); + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, + new WritePackToDiskTask(pack, pack_path)); SavePackName(pack_path); theme_pack_ = pack; diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index 9b7b512..06e1242 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -138,8 +138,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { : ViewEventTestBase(), model_(NULL), bb_view_(NULL), - ui_thread_(ChromeThread::UI, MessageLoop::current()), - file_thread_(ChromeThread::FILE, MessageLoop::current()) { + ui_thread_(BrowserThread::UI, MessageLoop::current()), + file_thread_(BrowserThread::FILE, MessageLoop::current()) { } virtual void SetUp() { @@ -248,8 +248,8 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { gfx::Size bb_view_pref_; scoped_ptr<TestingProfile> profile_; - ChromeThread ui_thread_; - ChromeThread file_thread_; + BrowserThread ui_thread_; + BrowserThread file_thread_; ViewsDelegateImpl views_delegate_; }; diff --git a/chrome/browser/views/bookmark_bar_view_unittest.cc b/chrome/browser/views/bookmark_bar_view_unittest.cc index b84e6b3..e0b7029 100644 --- a/chrome/browser/views/bookmark_bar_view_unittest.cc +++ b/chrome/browser/views/bookmark_bar_view_unittest.cc @@ -12,10 +12,10 @@ class BookmarkBarViewTest : public BrowserWithTestWindowTest { public: BookmarkBarViewTest() - : file_thread_(ChromeThread::FILE, message_loop()) {} + : file_thread_(BrowserThread::FILE, message_loop()) {} private: - ChromeThread file_thread_; + BrowserThread file_thread_; DISALLOW_COPY_AND_ASSIGN(BookmarkBarViewTest); }; diff --git a/chrome/browser/views/bookmark_context_menu_test.cc b/chrome/browser/views/bookmark_context_menu_test.cc index 48b2ce0..2d726cb 100644 --- a/chrome/browser/views/bookmark_context_menu_test.cc +++ b/chrome/browser/views/bookmark_context_menu_test.cc @@ -40,8 +40,8 @@ class TestingPageNavigator : public PageNavigator { class BookmarkContextMenuTest : public testing::Test { public: BookmarkContextMenuTest() - : 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) { } @@ -71,8 +71,8 @@ class BookmarkContextMenuTest : 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/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc index 95a095a..6da7618 100644 --- a/chrome/browser/views/bookmark_editor_view_unittest.cc +++ b/chrome/browser/views/bookmark_editor_view_unittest.cc @@ -23,8 +23,8 @@ class BookmarkEditorViewTest : public testing::Test { public: BookmarkEditorViewTest() : model_(NULL), - 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() { @@ -123,8 +123,8 @@ class BookmarkEditorViewTest : public testing::Test { } scoped_ptr<BookmarkEditorView> editor_; - ChromeThread ui_thread_; - ChromeThread file_thread_; + BrowserThread ui_thread_; + BrowserThread file_thread_; }; // Makes sure the tree model matches that of the bookmark bar model. diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index a1c1937..2212d89 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -1450,7 +1450,7 @@ void CloudPrintProxySection::StatusCallback(bool enabled, std::string email) { } void CloudPrintProxySection::OnDialogClosed() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); enable_disable_button_->SetEnabled(true); // If the dialog is canceled, the preference won't change, and so we // have to revert the button text back to the disabled state. diff --git a/chrome/browser/views/select_file_dialog.cc b/chrome/browser/views/select_file_dialog.cc index 523f817..792fb22 100644 --- a/chrome/browser/views/select_file_dialog.cc +++ b/chrome/browser/views/select_file_dialog.cc @@ -159,8 +159,8 @@ class SelectFileDialogImpl : public SelectFileDialog { // static SelectFileDialog* SelectFileDialog::Create(Listener* listener) { - DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::IO)); - DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); + DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::FILE)); return new SelectFileDialogImpl(listener); } @@ -227,8 +227,8 @@ void SelectFileDialogImpl::SelectFile( DCHECK(browser); browser->BrowserShowHtmlDialog(file_browse_delegate, owning_window); } else { - ChromeThread::PostTask( - ChromeThread::UI, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &SelectFileDialogImpl::OpenHtmlDialog, diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index 71e29187..c1c6973 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -712,8 +712,8 @@ void SelectFileDialogImpl::ExecuteSelectFile( std::vector<FilePath> paths; if (RunOpenMultiFileDialog(params.title, filter, params.run_state.owner, &paths)) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SelectFileDialogImpl::MultiFilesSelected, paths, params.params, params.run_state)); @@ -722,14 +722,14 @@ void SelectFileDialogImpl::ExecuteSelectFile( } if (success) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SelectFileDialogImpl::FileSelected, path, filter_index, params.params, params.run_state)); } else { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SelectFileDialogImpl::FileNotSelected, params.params, params.run_state)); @@ -1026,14 +1026,14 @@ void SelectFontDialogImpl::ExecuteSelectFont(RunState run_state, void* params) { bool success = !!ChooseFont(&cf); DisableOwner(run_state.owner); if (success) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SelectFontDialogImpl::FontSelected, logfont, params, run_state)); } else { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SelectFontDialogImpl::FontNotSelected, params, run_state)); } @@ -1089,14 +1089,14 @@ void SelectFontDialogImpl::ExecuteSelectFontWithNameSize( bool success = !!ChooseFont(&cf); DisableOwner(run_state.owner); if (success) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod( this, &SelectFontDialogImpl::FontSelected, logfont, params, run_state)); } else { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &SelectFontDialogImpl::FontNotSelected, params, run_state)); } diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc index 6501120..2542ea4 100644 --- a/chrome/browser/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/views/tab_contents/tab_contents_drag_win.cc @@ -105,7 +105,7 @@ TabContentsDragWin::TabContentsDragWin(TabContentsViewWin* view) } TabContentsDragWin::~TabContentsDragWin() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!drag_drop_thread_.get()); } @@ -113,7 +113,7 @@ void TabContentsDragWin::StartDragging(const WebDropData& drop_data, WebDragOperationsMask ops, const SkBitmap& image, const gfx::Point& image_offset) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); drag_source_ = new WebDragSource(view_->GetNativeView(), view_->tab_contents()); @@ -175,8 +175,8 @@ void TabContentsDragWin::StartBackgroundDragging( drag_drop_thread_id_ = PlatformThread::CurrentId(); DoDragging(drop_data, ops, page_url, page_encoding, image, image_offset); - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &TabContentsDragWin::EndDragging, true)); } @@ -313,7 +313,7 @@ void TabContentsDragWin::DoDragging(const WebDropData& drop_data, } void TabContentsDragWin::EndDragging(bool restore_suspended_state) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (drag_ended_) return; @@ -332,13 +332,13 @@ void TabContentsDragWin::EndDragging(bool restore_suspended_state) { } void TabContentsDragWin::CancelDrag() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); drag_source_->CancelDrag(); } void TabContentsDragWin::CloseThread() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); drag_drop_thread_.reset(); } @@ -349,8 +349,8 @@ void TabContentsDragWin::OnWaitForData() { // When the left button is release and we start to wait for the data, end // the dragging before DoDragDrop returns. This makes the page leave the drag // mode so that it can start to process the normal input events. - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &TabContentsDragWin::EndDragging, true)); } @@ -359,7 +359,7 @@ void TabContentsDragWin::OnDataObjectDisposed() { // The drag-and-drop thread is only closed after OLE is done with // DataObjectImpl. - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &TabContentsDragWin::CloseThread)); } diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 99e004b..6e4c0d3 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -259,7 +259,7 @@ void CreateShortcutTask::Run() { } bool CreateShortcutTask::CreateShortcut() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); #if defined(OS_LINUX) scoped_ptr<base::Environment> env(base::Environment::Create()); @@ -516,7 +516,7 @@ void UpdateShortcutWorker::Observe(NotificationType type, void UpdateShortcutWorker::DownloadIcon() { // FetchIcon must run on UI thread because it relies on TabContents // to download the icon. - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (tab_contents_ == NULL) { DeleteMe(); // We are done if underlying TabContents is gone. @@ -557,7 +557,7 @@ void UpdateShortcutWorker::OnIconDownloaded(int download_id, } void UpdateShortcutWorker::CheckExistingShortcuts() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); // Locations to check to shortcut_paths. struct { @@ -605,13 +605,13 @@ void UpdateShortcutWorker::CheckExistingShortcuts() { } void UpdateShortcutWorker::UpdateShortcuts() { - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(this, &UpdateShortcutWorker::UpdateShortcutsOnFileThread)); } void UpdateShortcutWorker::UpdateShortcutsOnFileThread() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); FilePath web_app_path = GetWebAppDataDirectory( web_app::GetDataDir(profile_path_), shortcut_info_.url); @@ -660,16 +660,16 @@ void UpdateShortcutWorker::OnShortcutsUpdated(bool) { } void UpdateShortcutWorker::DeleteMe() { - if (ChromeThread::CurrentlyOn(ChromeThread::UI)) { + if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { DeleteMeOnUIThread(); } else { - ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &UpdateShortcutWorker::DeleteMeOnUIThread)); } } void UpdateShortcutWorker::DeleteMeOnUIThread() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); delete this; } #endif // defined(OS_WIN) @@ -696,7 +696,7 @@ void CreateShortcut( const FilePath& data_dir, const ShellIntegration::ShortcutInfo& shortcut_info, CreateShortcutCallback* callback) { - ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, new CreateShortcutTask(data_dir, shortcut_info, callback)); } diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 33e42b8..1c88b6e 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -18,7 +18,7 @@ class WebApplicationTest : public RenderViewHostTestHarness { public: WebApplicationTest() : RenderViewHostTestHarness(), - ui_thread_(ChromeThread::UI, &message_loop_) { + ui_thread_(BrowserThread::UI, &message_loop_) { } private: @@ -36,7 +36,7 @@ class WebApplicationTest : public RenderViewHostTestHarness { profile_.reset(NULL); } - ChromeThread ui_thread_; + BrowserThread ui_thread_; }; TEST_F(WebApplicationTest, GetShortcutInfoForTab) { diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 16e06dd..8442e5e 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -120,10 +120,10 @@ class WebResourceService::UnpackerClient web_resource_service_->resource_dispatcher_host_ != NULL && !CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess); if (use_utility_process) { - ChromeThread::ID thread_id; - CHECK(ChromeThread::GetCurrentThreadIdentifier(&thread_id)); - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::ID thread_id; + CHECK(BrowserThread::GetCurrentThreadIdentifier(&thread_id)); + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod(this, &UnpackerClient::StartProcessOnIOThread, web_resource_service_->resource_dispatcher_host_, thread_id)); @@ -170,7 +170,7 @@ class WebResourceService::UnpackerClient } void StartProcessOnIOThread(ResourceDispatcherHost* rdh, - ChromeThread::ID thread_id) { + BrowserThread::ID thread_id) { UtilityProcessHost* host = new UtilityProcessHost(rdh, this, thread_id); // TODO(mrc): get proper file path when we start using web resources // that need to be unpacked. diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc index 16cceac..138596a 100644 --- a/chrome/browser/webdata/web_data_service.cc +++ b/chrome/browser/webdata/web_data_service.cc @@ -82,7 +82,7 @@ bool WebDataService::IsDatabaseLoaded() { } WebDatabase* WebDataService::GetDatabase() { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); return db_; } @@ -565,8 +565,8 @@ void WebDataService::InitializeDatabaseIfNecessary() { return; } - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, NewRunnableMethod(this, &WebDataService::NotifyDatabaseLoadedOnUIThread)); db_ = db; @@ -603,7 +603,7 @@ void WebDataService::Commit() { void WebDataService::ScheduleTask(Task* t) { if (is_running_) - ChromeThread::PostTask(ChromeThread::DB, FROM_HERE, t); + BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, t); else NOTREACHED() << "Task scheduled after Shutdown()"; } diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 3c572f4..c8360aa 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -159,7 +159,7 @@ class WebDataServiceConsumer; class WebDataService : public base::RefCountedThreadSafe<WebDataService, - ChromeThread::DeleteOnUIThread> { + BrowserThread::DeleteOnUIThread> { public: // All requests return an opaque handle of the following type. typedef int Handle; diff --git a/chrome/browser/webdata/web_data_service_test_util.h b/chrome/browser/webdata/web_data_service_test_util.h index 2ff1e09..6f4ef06 100644 --- a/chrome/browser/webdata/web_data_service_test_util.h +++ b/chrome/browser/webdata/web_data_service_test_util.h @@ -19,7 +19,7 @@ class AutofillWebDataServiceConsumer: public WebDataServiceConsumer { virtual void OnWebDataServiceRequestDone(WebDataService::Handle handle, const WDTypedResult* result) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); handle_ = handle; const WDResult<T>* wrapped_result = static_cast<const WDResult<T>*>(result); diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 263578a..9e4bf84 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -67,8 +67,8 @@ class AutofillDBThreadObserverHelper : public DBThreadObserverHelper { class WebDataServiceTest : public testing::Test { public: WebDataServiceTest() - : ui_thread_(ChromeThread::UI, &message_loop_), - db_thread_(ChromeThread::DB) {} + : ui_thread_(BrowserThread::UI, &message_loop_), + db_thread_(BrowserThread::DB) {} protected: virtual void SetUp() { @@ -94,8 +94,8 @@ class WebDataServiceTest : public testing::Test { } MessageLoopForUI message_loop_; - ChromeThread ui_thread_; - ChromeThread db_thread_; + BrowserThread ui_thread_; + BrowserThread db_thread_; FilePath profile_dir_; scoped_refptr<WebDataService> wds_; }; diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc index 1c2efd3..4532e36 100644 --- a/chrome/browser/worker_host/worker_process_host.cc +++ b/chrome/browser/worker_host/worker_process_host.cc @@ -103,8 +103,8 @@ WorkerProcessHost::~WorkerProcessHost() { i->worker_document_set()->documents(); for (WorkerDocumentSet::DocumentInfoSet::const_iterator parent_iter = parents.begin(); parent_iter != parents.end(); ++parent_iter) { - ChromeThread::PostTask( - ChromeThread::UI, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, new WorkerCrashTask(parent_iter->renderer_id(), parent_iter->render_view_route_id())); } |