diff --git a/chrome/browser/signin/dice_response_handler_unittest.cc b/chrome/browser/signin/dice_response_handler_unittest.cc index dde735f..6ad0e165 100644 --- a/chrome/browser/signin/dice_response_handler_unittest.cc +++ b/chrome/browser/signin/dice_response_handler_unittest.cc
@@ -116,6 +116,24 @@ EXPECT_TRUE(token_service_.RefreshTokenIsAvailable(dice_params.gaia_id)); } +// Checks that a GaiaAuthFetcher failure is handled correctly. +TEST_F(DiceResponseHandlerTest, SigninFailure) { + DiceResponseParams dice_params = MakeDiceParams(DiceAction::SIGNIN); + ASSERT_FALSE(token_service_.RefreshTokenIsAvailable(dice_params.gaia_id)); + dice_response_handler_.ProcessDiceHeader(dice_params); + // Check that a GaiaAuthFetcher has been created. + ASSERT_THAT(signin_client_.consumer_, testing::NotNull()); + EXPECT_EQ( + 1u, dice_response_handler_.GetPendingDiceTokenFetchersCountForTesting()); + // Simulate GaiaAuthFetcher failure. + signin_client_.consumer_->OnClientOAuthFailure( + GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE)); + EXPECT_EQ( + 0u, dice_response_handler_.GetPendingDiceTokenFetchersCountForTesting()); + // Check that the token has not been inserted in the token service. + EXPECT_FALSE(token_service_.RefreshTokenIsAvailable(dice_params.gaia_id)); +} + // Checks that a second token for the same account is not requested when a // request is already in flight. TEST_F(DiceResponseHandlerTest, SigninRepeatedWithSameAccount) { @@ -180,6 +198,8 @@ base::TimeDelta::FromSeconds(kDiceTokenFetchTimeoutSeconds + 1)); EXPECT_EQ( 0u, dice_response_handler_.GetPendingDiceTokenFetchersCountForTesting()); + // Check that the token has not been inserted in the token service. + EXPECT_FALSE(token_service_.RefreshTokenIsAvailable(dice_params.gaia_id)); } // Tests that the DiceResponseHandler is created for a normal profile but not
diff --git a/components/browser_sync/profile_sync_service_autofill_unittest.cc b/components/browser_sync/profile_sync_service_autofill_unittest.cc index 4698646..54135dd 100644 --- a/components/browser_sync/profile_sync_service_autofill_unittest.cc +++ b/components/browser_sync/profile_sync_service_autofill_unittest.cc
@@ -196,11 +196,11 @@ autofill::AutofillWebDataServiceObserverOnDBThread* observer) override {} void RemoveExpiredFormElements() override {} void NotifyOfMultipleAutofillChanges() override { - DCHECK(!ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(!ui_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask(FROM_HERE, on_changed_); } void NotifyThatSyncHasStarted(syncer::ModelType model_type) override { - DCHECK(!ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(!ui_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask(FROM_HERE, base::Bind(on_sync_started_, model_type)); } @@ -332,7 +332,7 @@ void CreateSyncableService( const base::Closure& on_changed_callback, const base::Callback<void(syncer::ModelType)>& on_sync_started) { - ASSERT_TRUE(db_thread_->RunsTasksOnCurrentThread()); + ASSERT_TRUE(db_thread_->RunsTasksInCurrentSequence()); // These services are deleted in DestroySyncableService(). backend_ = base::MakeUnique<MockAutofillBackend>( GetDatabase(), on_changed_callback, on_sync_started, ui_thread_.get()); @@ -350,7 +350,7 @@ } void DestroySyncableService() { - ASSERT_TRUE(db_thread_->RunsTasksOnCurrentThread()); + ASSERT_TRUE(db_thread_->RunsTasksInCurrentSequence()); autocomplete_syncable_service_ = nullptr; autofill_profile_syncable_service_ = nullptr; backend_.reset(); @@ -740,7 +740,7 @@ void Update() { // This gets called in a modelsafeworker thread. - ASSERT_TRUE(db_thread_->RunsTasksOnCurrentThread()); + ASSERT_TRUE(db_thread_->RunsTasksInCurrentSequence()); syncer::UserShare* user_share = service_->GetUserShare(); syncer::syncable::Directory* directory = user_share->directory.get(); @@ -789,7 +789,7 @@ void CreateNewEntry(const AutofillEntry& entry) { entry_ = entry; - ASSERT_FALSE(db_thread_->RunsTasksOnCurrentThread()); + ASSERT_FALSE(db_thread_->RunsTasksInCurrentSequence()); if (!db_thread_->PostTask(FROM_HERE, base::Bind(&FakeServerUpdater::Update, this))) { NOTREACHED() << "Failed to post task to the db thread.";
diff --git a/components/certificate_transparency/ct_policy_manager.cc b/components/certificate_transparency/ct_policy_manager.cc index 445f3d2..833014c 100644 --- a/components/certificate_transparency/ct_policy_manager.cc +++ b/components/certificate_transparency/ct_policy_manager.cc
@@ -89,7 +89,7 @@ net::TransportSecurityState::RequireCTDelegate::CTRequirementLevel CTPolicyManager::CTDelegate::IsCTRequiredForHost(const std::string& hostname) { - DCHECK(network_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(network_task_runner_->RunsTasksInCurrentSequence()); // Scheme and port are ignored by the policy, so it's OK to construct a // new GURL here. However, |hostname| is in network form, not URL form, @@ -125,7 +125,7 @@ void CTPolicyManager::CTDelegate::Update(base::ListValue* required_hosts, base::ListValue* excluded_hosts) { - DCHECK(network_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(network_task_runner_->RunsTasksInCurrentSequence()); url_matcher_.reset(new url_matcher::URLMatcher); filters_.clear();
diff --git a/components/component_updater/default_component_installer.cc b/components/component_updater/default_component_installer.cc index 161f6a6..c06c10c 100644 --- a/components/component_updater/default_component_installer.cc +++ b/components/component_updater/default_component_installer.cc
@@ -228,7 +228,7 @@ ComponentUpdateService* cus) { VLOG(1) << __func__ << " for " << installer_traits_->GetName(); DCHECK(task_runner_.get()); - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::Version latest_version(kNullVersion); @@ -325,7 +325,7 @@ void DefaultComponentInstaller::UninstallOnTaskRunner() { DCHECK(task_runner_.get()); - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); // Only try to delete any files that are in our user-level install path. base::FilePath userInstallPath;
diff --git a/components/device_event_log/device_event_log_impl.cc b/components/device_event_log/device_event_log_impl.cc index 5ea67e9..db7eb5b 100644 --- a/components/device_event_log/device_event_log_impl.cc +++ b/components/device_event_log/device_event_log_impl.cc
@@ -259,7 +259,7 @@ LogLevel log_level, const std::string& event) { LogEntry entry(file, file_line, log_type, log_level, event); - if (!task_runner_->RunsTasksOnCurrentThread()) { + if (!task_runner_->RunsTasksInCurrentSequence()) { task_runner_->PostTask(FROM_HERE, base::Bind(&DeviceEventLogImpl::AddLogEntry, weak_ptr_factory_.GetWeakPtr(), entry)); @@ -269,7 +269,7 @@ } void DeviceEventLogImpl::AddLogEntry(const LogEntry& entry) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); if (!entries_.empty()) { LogEntry& last = entries_.back(); if (LogEntryMatches(last, entry)) { @@ -307,7 +307,7 @@ const std::string& types, LogLevel max_level, size_t max_events) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); if (entries_.empty()) return "No Log Entries.";
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc index d5a437fb..b9b1153 100644 --- a/components/domain_reliability/monitor.cc +++ b/components/domain_reliability/monitor.cc
@@ -152,7 +152,7 @@ // Make sure the URLRequestContext actually lives on what was declared to be // the network thread. DCHECK(url_request_context_getter->GetNetworkTaskRunner()-> - RunsTasksOnCurrentThread()); + RunsTasksInCurrentSequence()); uploader_ = DomainReliabilityUploader::Create(time_.get(), url_request_context_getter);
diff --git a/components/drive/chromeos/file_cache.cc b/components/drive/chromeos/file_cache.cc index a9597cf..9d286216 100644 --- a/components/drive/chromeos/file_cache.cc +++ b/components/drive/chromeos/file_cache.cc
@@ -194,7 +194,7 @@ } void FileCache::AssertOnSequencedWorkerPool() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); } bool FileCache::IsUnderFileCacheDirectory(const base::FilePath& path) const {
diff --git a/components/drive/chromeos/resource_metadata.cc b/components/drive/chromeos/resource_metadata.cc index d482dc25..64d1363 100644 --- a/components/drive/chromeos/resource_metadata.cc +++ b/components/drive/chromeos/resource_metadata.cc
@@ -80,7 +80,7 @@ } FileError ResourceMetadata::Initialize() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); return SetUpDefaultEntries(); } @@ -94,7 +94,7 @@ } FileError ResourceMetadata::Reset() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); if (!EnoughDiskSpaceIsAvailableForDBOperation(storage_->directory_path())) return FILE_ERROR_NO_LOCAL_SPACE; @@ -119,11 +119,11 @@ } ResourceMetadata::~ResourceMetadata() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); } FileError ResourceMetadata::SetUpDefaultEntries() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); // Initialize "/drive". ResourceEntry entry; @@ -227,17 +227,17 @@ } void ResourceMetadata::DestroyOnBlockingPool() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); delete this; } FileError ResourceMetadata::GetLargestChangestamp(int64_t* out_value) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); return storage_->GetLargestChangestamp(out_value); } FileError ResourceMetadata::SetLargestChangestamp(int64_t value) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); if (!EnoughDiskSpaceIsAvailableForDBOperation(storage_->directory_path())) return FILE_ERROR_NO_LOCAL_SPACE; @@ -247,7 +247,7 @@ FileError ResourceMetadata::AddEntry(const ResourceEntry& entry, std::string* out_id) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(entry.local_id().empty()); if (!EnoughDiskSpaceIsAvailableForDBOperation(storage_->directory_path())) @@ -291,7 +291,7 @@ } FileError ResourceMetadata::RemoveEntry(const std::string& id) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); if (!EnoughDiskSpaceIsAvailableForDBOperation(storage_->directory_path())) return FILE_ERROR_NO_LOCAL_SPACE; @@ -310,7 +310,7 @@ FileError ResourceMetadata::GetResourceEntryById(const std::string& id, ResourceEntry* out_entry) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(!id.empty()); DCHECK(out_entry); @@ -319,7 +319,7 @@ FileError ResourceMetadata::GetResourceEntryByPath(const base::FilePath& path, ResourceEntry* out_entry) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(out_entry); std::string id; @@ -333,7 +333,7 @@ FileError ResourceMetadata::ReadDirectoryByPath( const base::FilePath& path, ResourceEntryVector* out_entries) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(out_entries); std::string id; @@ -346,7 +346,7 @@ FileError ResourceMetadata::ReadDirectoryById( const std::string& id, ResourceEntryVector* out_entries) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(out_entries); ResourceEntry entry; @@ -373,7 +373,7 @@ } FileError ResourceMetadata::RefreshEntry(const ResourceEntry& entry) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); if (!EnoughDiskSpaceIsAvailableForDBOperation(storage_->directory_path())) return FILE_ERROR_NO_LOCAL_SPACE; @@ -431,7 +431,7 @@ FileError ResourceMetadata::GetSubDirectoriesRecursively( const std::string& id, std::set<base::FilePath>* sub_directories) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); std::vector<std::string> children; FileError error = storage_->GetChildren(id, &children); @@ -457,19 +457,19 @@ FileError ResourceMetadata::GetChildId(const std::string& parent_local_id, const std::string& base_name, std::string* out_child_id) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); return storage_->GetChild(parent_local_id, base_name, out_child_id); } std::unique_ptr<ResourceMetadata::Iterator> ResourceMetadata::GetIterator() { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); return storage_->GetIterator(); } FileError ResourceMetadata::GetFilePath(const std::string& id, base::FilePath* out_file_path) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); ResourceEntry entry; FileError error = storage_->GetEntry(id, &entry); @@ -492,7 +492,7 @@ FileError ResourceMetadata::GetIdByPath(const base::FilePath& file_path, std::string* out_id) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); // Start from the root. std::vector<base::FilePath::StringType> components; @@ -517,12 +517,12 @@ FileError ResourceMetadata::GetIdByResourceId(const std::string& resource_id, std::string* out_local_id) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); return storage_->GetIdByResourceId(resource_id, out_local_id); } FileError ResourceMetadata::PutEntryUnderDirectory(const ResourceEntry& entry) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(!entry.local_id().empty()); DCHECK(!entry.parent_local_id().empty()); @@ -538,7 +538,7 @@ FileError ResourceMetadata::GetDeduplicatedBaseName( const ResourceEntry& entry, std::string* base_name) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); DCHECK(!entry.parent_local_id().empty()); DCHECK(!entry.title().empty()); @@ -601,7 +601,7 @@ } FileError ResourceMetadata::RemoveEntryRecursively(const std::string& id) { - DCHECK(blocking_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner_->RunsTasksInCurrentSequence()); ResourceEntry entry; FileError error = storage_->GetEntry(id, &entry);
diff --git a/components/gcm_driver/fake_gcm_client.cc b/components/gcm_driver/fake_gcm_client.cc index ece564a..2f992c52 100644 --- a/components/gcm_driver/fake_gcm_client.cc +++ b/components/gcm_driver/fake_gcm_client.cc
@@ -86,7 +86,7 @@ } void FakeGCMClient::Start(StartMode start_mode) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (started_) return; @@ -109,14 +109,14 @@ } void FakeGCMClient::Stop() { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); started_ = false; delegate_->OnDisconnected(); } void FakeGCMClient::Register( const linked_ptr<RegistrationInfo>& registration_info) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); std::string registration_id; @@ -149,7 +149,7 @@ void FakeGCMClient::Unregister( const linked_ptr<RegistrationInfo>& registration_info) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&FakeGCMClient::UnregisterFinished, @@ -159,7 +159,7 @@ void FakeGCMClient::Send(const std::string& app_id, const std::string& receiver_id, const OutgoingMessage& message) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&FakeGCMClient::SendFinished, @@ -236,7 +236,7 @@ } void FakeGCMClient::PerformDelayedStart() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, @@ -245,7 +245,7 @@ void FakeGCMClient::ReceiveMessage(const std::string& app_id, const IncomingMessage& message) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, @@ -256,7 +256,7 @@ } void FakeGCMClient::DeleteMessages(const std::string& app_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE,
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc index e7aecc8..9c3fa552 100644 --- a/components/gcm_driver/gcm_driver_desktop.cc +++ b/components/gcm_driver/gcm_driver_desktop.cc
@@ -135,11 +135,11 @@ const scoped_refptr<base::SequencedTaskRunner>& io_thread) : ui_thread_(ui_thread), io_thread_(io_thread) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); } GCMDriverDesktop::IOWorker::~IOWorker() { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); } void GCMDriverDesktop::IOWorker::Initialize( @@ -152,7 +152,7 @@ tracked_objects::ScopedTracker tracking_profile( FROM_HERE_WITH_EXPLICIT_FUNCTION( "477117 GCMDriverDesktop::IOWorker::Initialize")); - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm_client_ = gcm_client_factory->BuildInstance(); @@ -165,7 +165,7 @@ const linked_ptr<RegistrationInfo>& registration_info, const std::string& registration_id, GCMClient::Result result) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); const GCMRegistrationInfo* gcm_registration_info = GCMRegistrationInfo::FromRegistrationInfo(registration_info.get()); @@ -197,7 +197,7 @@ void GCMDriverDesktop::IOWorker::OnUnregisterFinished( const linked_ptr<RegistrationInfo>& registration_info, GCMClient::Result result) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); const GCMRegistrationInfo* gcm_registration_info = GCMRegistrationInfo::FromRegistrationInfo(registration_info.get()); @@ -227,7 +227,7 @@ void GCMDriverDesktop::IOWorker::OnSendFinished(const std::string& app_id, const std::string& message_id, GCMClient::Result result) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask( FROM_HERE, @@ -238,7 +238,7 @@ void GCMDriverDesktop::IOWorker::OnMessageReceived( const std::string& app_id, const IncomingMessage& message) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask( FROM_HERE, @@ -249,7 +249,7 @@ } void GCMDriverDesktop::IOWorker::OnMessagesDeleted(const std::string& app_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask( FROM_HERE, @@ -259,7 +259,7 @@ void GCMDriverDesktop::IOWorker::OnMessageSendError( const std::string& app_id, const GCMClient::SendErrorDetails& send_error_details) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask( FROM_HERE, @@ -270,7 +270,7 @@ void GCMDriverDesktop::IOWorker::OnSendAcknowledged( const std::string& app_id, const std::string& message_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); ui_thread_->PostTask( FROM_HERE, @@ -289,7 +289,7 @@ } void GCMDriverDesktop::IOWorker::OnActivityRecorded() { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); // When an activity is recorded, get all the stats and refresh the UI of // gcm-internals page. GetGCMStatistics(GCMDriver::KEEP_LOGS); @@ -316,14 +316,14 @@ void GCMDriverDesktop::IOWorker::Start( GCMClient::StartMode start_mode, const base::WeakPtr<GCMDriverDesktop>& service) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); service_ = service; gcm_client_->Start(start_mode); } void GCMDriverDesktop::IOWorker::Stop() { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm_client_->Stop(); } @@ -331,7 +331,7 @@ void GCMDriverDesktop::IOWorker::Register( const std::string& app_id, const std::vector<std::string>& sender_ids) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); std::unique_ptr<GCMRegistrationInfo> gcm_info(new GCMRegistrationInfo); gcm_info->app_id = app_id; @@ -342,14 +342,14 @@ bool GCMDriverDesktop::IOWorker::ValidateRegistration( std::unique_ptr<RegistrationInfo> registration_info, const std::string& registration_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); return gcm_client_->ValidateRegistration( make_linked_ptr(registration_info.release()), registration_id); } void GCMDriverDesktop::IOWorker::Unregister(const std::string& app_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); std::unique_ptr<GCMRegistrationInfo> gcm_info(new GCMRegistrationInfo); gcm_info->app_id = app_id; @@ -360,14 +360,14 @@ void GCMDriverDesktop::IOWorker::Send(const std::string& app_id, const std::string& receiver_id, const OutgoingMessage& message) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm_client_->Send(app_id, receiver_id, message); } void GCMDriverDesktop::IOWorker::GetGCMStatistics( ClearActivityLogs clear_logs) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm::GCMClient::GCMStatistics stats; if (gcm_client_.get()) { @@ -382,7 +382,7 @@ } void GCMDriverDesktop::IOWorker::SetGCMRecording(bool recording) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm::GCMClient::GCMStatistics stats; if (gcm_client_.get()) { @@ -398,7 +398,7 @@ void GCMDriverDesktop::IOWorker::SetAccountTokens( const std::vector<GCMClient::AccountTokenInfo>& account_tokens) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (gcm_client_.get()) gcm_client_->SetAccountTokens(account_tokens); @@ -406,7 +406,7 @@ void GCMDriverDesktop::IOWorker::UpdateAccountMapping( const AccountMapping& account_mapping) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (gcm_client_.get()) gcm_client_->UpdateAccountMapping(account_mapping); @@ -414,14 +414,14 @@ void GCMDriverDesktop::IOWorker::RemoveAccountMapping( const std::string& account_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (gcm_client_.get()) gcm_client_->RemoveAccountMapping(account_id); } void GCMDriverDesktop::IOWorker::SetLastTokenFetchTime(const base::Time& time) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (gcm_client_.get()) gcm_client_->SetLastTokenFetchTime(time); @@ -431,7 +431,7 @@ const std::string& app_id, const std::string& instance_id, const std::string& extra_data) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (gcm_client_.get()) gcm_client_->AddInstanceIDData(app_id, instance_id, extra_data); @@ -439,7 +439,7 @@ void GCMDriverDesktop::IOWorker::RemoveInstanceIDData( const std::string& app_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); if (gcm_client_.get()) gcm_client_->RemoveInstanceIDData(app_id); @@ -447,7 +447,7 @@ void GCMDriverDesktop::IOWorker::GetInstanceIDData( const std::string& app_id) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); std::string instance_id; std::string extra_data; @@ -465,7 +465,7 @@ const std::string& authorized_entity, const std::string& scope, const std::map<std::string, std::string>& options) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); std::unique_ptr<InstanceIDTokenInfo> instance_id_token_info( new InstanceIDTokenInfo); @@ -492,7 +492,7 @@ void GCMDriverDesktop::IOWorker::WakeFromSuspendForHeartbeat(bool wake) { #if defined(OS_CHROMEOS) - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); std::unique_ptr<base::Timer> timer; if (wake) @@ -506,20 +506,20 @@ void GCMDriverDesktop::IOWorker::AddHeartbeatInterval(const std::string& scope, int interval_ms) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm_client_->AddHeartbeatInterval(scope, interval_ms); } void GCMDriverDesktop::IOWorker::RemoveHeartbeatInterval( const std::string& scope) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm_client_->RemoveHeartbeatInterval(scope); } void GCMDriverDesktop::IOWorker::RecordDecryptionFailure( const std::string& app_id, GCMEncryptionProvider::DecryptionResult result) { - DCHECK(io_thread_->RunsTasksOnCurrentThread()); + DCHECK(io_thread_->RunsTasksInCurrentSequence()); gcm_client_->RecordDecryptionFailure(app_id, result); } @@ -582,7 +582,7 @@ DCHECK(!sender_ids.empty() && sender_ids.size() <= kMaxSenders); DCHECK(!registration_id.empty()); DCHECK(!callback.is_null()); - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) { @@ -623,7 +623,7 @@ } void GCMDriverDesktop::Shutdown() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); Stop(); GCMDriver::Shutdown(); @@ -646,7 +646,7 @@ void GCMDriverDesktop::AddAppHandler(const std::string& app_id, GCMAppHandler* handler) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMDriver::AddAppHandler(app_id, handler); // Ensures that the GCM service is started when there is an interest. @@ -654,7 +654,7 @@ } void GCMDriverDesktop::RemoveAppHandler(const std::string& app_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMDriver::RemoveAppHandler(app_id); // Stops the GCM service when no app intends to consume it. Stop function will @@ -675,7 +675,7 @@ } void GCMDriverDesktop::Enable() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); if (gcm_enabled_) return; @@ -685,7 +685,7 @@ } void GCMDriverDesktop::Disable() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); if (!gcm_enabled_) return; @@ -695,7 +695,7 @@ } void GCMDriverDesktop::Stop() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // No need to stop GCM service if not started yet. if (!gcm_started_) @@ -729,7 +729,7 @@ void GCMDriverDesktop::DoRegister(const std::string& app_id, const std::vector<std::string>& sender_ids) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); if (!HasRegisterCallback(app_id)) { // The callback could have been removed when the app is uninstalled. return; @@ -757,7 +757,7 @@ } void GCMDriverDesktop::DoUnregister(const std::string& app_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // Ask the server to unregister it. There could be a small chance that the // unregister request fails. If this occurs, it does not bring any harm since @@ -788,7 +788,7 @@ void GCMDriverDesktop::DoSend(const std::string& app_id, const std::string& receiver_id, const OutgoingMessage& message) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, base::Bind(&GCMDriverDesktop::IOWorker::Send, @@ -801,7 +801,7 @@ void GCMDriverDesktop::RecordDecryptionFailure( const std::string& app_id, GCMEncryptionProvider::DecryptionResult result) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, base::Bind(&GCMDriverDesktop::IOWorker::RecordDecryptionFailure, @@ -810,12 +810,12 @@ } GCMClient* GCMDriverDesktop::GetGCMClientForTesting() const { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); return io_worker_ ? io_worker_->gcm_client_for_testing() : NULL; } bool GCMDriverDesktop::IsStarted() const { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); return gcm_started_; } @@ -826,7 +826,7 @@ void GCMDriverDesktop::GetGCMStatistics( const GetGCMStatisticsCallback& callback, ClearActivityLogs clear_logs) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); DCHECK(!callback.is_null()); request_gcm_statistics_callback_ = callback; @@ -839,7 +839,7 @@ void GCMDriverDesktop::SetGCMRecording(const GetGCMStatisticsCallback& callback, bool recording) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); request_gcm_statistics_callback_ = callback; io_thread_->PostTask( @@ -851,7 +851,7 @@ void GCMDriverDesktop::UpdateAccountMapping( const AccountMapping& account_mapping) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, @@ -861,7 +861,7 @@ } void GCMDriverDesktop::RemoveAccountMapping(const std::string& account_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, @@ -875,7 +875,7 @@ } void GCMDriverDesktop::SetLastTokenFetchTime(const base::Time& time) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); last_token_fetch_time_ = time; @@ -900,7 +900,7 @@ DCHECK(!authorized_entity.empty()); DCHECK(!scope.empty()); DCHECK(!callback.is_null()); - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) { @@ -937,7 +937,7 @@ const std::string& authorized_entity, const std::string& scope, const std::map<std::string, std::string>& options) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); TokenTuple tuple_key(app_id, authorized_entity, scope); auto callback_iter = get_token_callbacks_.find(tuple_key); @@ -966,7 +966,7 @@ DCHECK(!scope.empty()); DCHECK(!token.empty()); DCHECK(!callback.is_null()); - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) { @@ -1001,7 +1001,7 @@ DCHECK(!authorized_entity.empty()); DCHECK(!scope.empty()); DCHECK(!callback.is_null()); - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) { @@ -1036,7 +1036,7 @@ void GCMDriverDesktop::DoDeleteToken(const std::string& app_id, const std::string& authorized_entity, const std::string& scope) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); io_thread_->PostTask( FROM_HERE, @@ -1051,7 +1051,7 @@ const std::string& app_id, const std::string& instance_id, const std::string& extra_data) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) @@ -1085,7 +1085,7 @@ } void GCMDriverDesktop::RemoveInstanceIDData(const std::string& app_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) @@ -1115,7 +1115,7 @@ const std::string& app_id, const GetInstanceIDDataCallback& callback) { DCHECK(!get_instance_id_data_callbacks_.count(app_id)); - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); if (result != GCMClient::SUCCESS) { @@ -1189,7 +1189,7 @@ } void GCMDriverDesktop::WakeFromSuspendForHeartbeat(bool wake) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); wake_from_suspend_enabled_ = wake; @@ -1217,7 +1217,7 @@ void GCMDriverDesktop::AddHeartbeatInterval(const std::string& scope, int interval_ms) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // The GCM service has not been initialized. if (!delayed_task_controller_) @@ -1238,7 +1238,7 @@ } void GCMDriverDesktop::RemoveHeartbeatInterval(const std::string& scope) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // The GCM service has not been initialized. if (!delayed_task_controller_) @@ -1260,7 +1260,7 @@ void GCMDriverDesktop::SetAccountTokens( const std::vector<GCMClient::AccountTokenInfo>& account_tokens) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); account_mapper_->SetAccountTokens(account_tokens); @@ -1273,7 +1273,7 @@ GCMClient::Result GCMDriverDesktop::EnsureStarted( GCMClient::StartMode start_mode) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); if (gcm_started_) return GCMClient::SUCCESS; @@ -1305,7 +1305,7 @@ } void GCMDriverDesktop::RemoveCachedData() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // Remove all the queued tasks since they no longer make sense after // GCM service is stopped. weak_ptr_factory_.InvalidateWeakPtrs(); @@ -1317,7 +1317,7 @@ void GCMDriverDesktop::MessageReceived(const std::string& app_id, const IncomingMessage& message) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // Drop the event if the service has been stopped. if (!gcm_started_) @@ -1327,7 +1327,7 @@ } void GCMDriverDesktop::MessagesDeleted(const std::string& app_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // Drop the event if the service has been stopped. if (!gcm_started_) @@ -1341,7 +1341,7 @@ void GCMDriverDesktop::MessageSendError( const std::string& app_id, const GCMClient::SendErrorDetails& send_error_details) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // Drop the event if the service has been stopped. if (!gcm_started_) @@ -1354,7 +1354,7 @@ void GCMDriverDesktop::SendAcknowledged(const std::string& app_id, const std::string& message_id) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // Drop the event if the service has been stopped. if (!gcm_started_) @@ -1368,7 +1368,7 @@ void GCMDriverDesktop::GCMClientReady( const std::vector<AccountMapping>& account_mappings, const base::Time& last_token_fetch_time) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); UMA_HISTOGRAM_BOOLEAN("GCM.UserSignedIn", signed_in_); @@ -1387,7 +1387,7 @@ } void GCMDriverDesktop::OnConnected(const net::IPEndPoint& ip_endpoint) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); connected_ = true; @@ -1400,7 +1400,7 @@ } void GCMDriverDesktop::OnDisconnected() { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); connected_ = false; @@ -1425,7 +1425,7 @@ void GCMDriverDesktop::GetGCMStatisticsFinished( const GCMClient::GCMStatistics& stats) { - DCHECK(ui_thread_->RunsTasksOnCurrentThread()); + DCHECK(ui_thread_->RunsTasksInCurrentSequence()); // request_gcm_statistics_callback_ could be null when an activity, i.e. // network activity, is triggered while gcm-intenals page is not open.
diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc index 72bf92e2..f983265 100644 --- a/components/history/core/browser/top_sites_impl.cc +++ b/components/history/core/browser/top_sites_impl.cc
@@ -51,7 +51,7 @@ const MostVisitedURLList& nonforced_urls) { const MostVisitedURLList& urls = include_forced_urls ? all_urls : nonforced_urls; - if (task_runner->RunsTasksOnCurrentThread()) + if (task_runner->RunsTasksInCurrentSequence()) callback.Run(urls); else task_runner->PostTask(FROM_HERE, base::Bind(callback, urls));
diff --git a/components/keyed_service/core/refcounted_keyed_service.cc b/components/keyed_service/core/refcounted_keyed_service.cc index 04a1ea5..e6c449fe 100644 --- a/components/keyed_service/core/refcounted_keyed_service.cc +++ b/components/keyed_service/core/refcounted_keyed_service.cc
@@ -10,7 +10,7 @@ // static void RefcountedKeyedServiceTraits::Destruct(const RefcountedKeyedService* obj) { - if (obj->task_runner_ && !obj->task_runner_->RunsTasksOnCurrentThread()) { + if (obj->task_runner_ && !obj->task_runner_->RunsTasksInCurrentSequence()) { obj->task_runner_->DeleteSoon(FROM_HERE, obj); } else { delete obj;
diff --git a/components/metrics/leak_detector/leak_detector.cc b/components/metrics/leak_detector/leak_detector.cc index 800ff3b..ac03e61 100644 --- a/components/metrics/leak_detector/leak_detector.cc +++ b/components/metrics/leak_detector/leak_detector.cc
@@ -338,7 +338,7 @@ if (reports.empty()) return; - if (!task_runner_->RunsTasksOnCurrentThread()) { + if (!task_runner_->RunsTasksInCurrentSequence()) { task_runner_->PostTask(FROM_HERE, base::Bind(&LeakDetector::NotifyObservers, base::Unretained(this), reports));
diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc index aefa83f..9fe54dc4 100644 --- a/components/policy/core/browser/url_blacklist_manager.cc +++ b/components/policy/core/browser/url_blacklist_manager.cc
@@ -452,7 +452,7 @@ } void URLBlacklistManager::ShutdownOnUIThread() { - DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(ui_task_runner_->RunsTasksInCurrentSequence()); // Cancel any pending updates, and stop listening for pref change updates. ui_weak_ptr_factory_.InvalidateWeakPtrs(); pref_change_registrar_.RemoveAll(); @@ -462,7 +462,7 @@ } void URLBlacklistManager::ScheduleUpdate() { - DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(ui_task_runner_->RunsTasksInCurrentSequence()); // Cancel pending updates, if any. This can happen if two preferences that // change the blacklist are updated in one message loop cycle. In those cases, // only rebuild the blacklist after all the preference updates are processed. @@ -474,7 +474,7 @@ } void URLBlacklistManager::Update() { - DCHECK(ui_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(ui_task_runner_->RunsTasksInCurrentSequence()); // The preferences can only be read on the UI thread. std::unique_ptr<base::ListValue> block( @@ -494,7 +494,7 @@ void URLBlacklistManager::UpdateOnIO(std::unique_ptr<base::ListValue> block, std::unique_ptr<base::ListValue> allow) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); // The URLBlacklist is built on a worker thread. Once it's ready, it is passed // to the URLBlacklistManager on IO. base::PostTaskAndReplyWithResult( @@ -509,24 +509,24 @@ void URLBlacklistManager::SetBlacklist( std::unique_ptr<URLBlacklist> blacklist) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); blacklist_ = std::move(blacklist); } bool URLBlacklistManager::IsURLBlocked(const GURL& url) const { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); return blacklist_->IsURLBlocked(url); } URLBlacklist::URLBlacklistState URLBlacklistManager::GetURLBlacklistState( const GURL& url) const { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); return blacklist_->GetURLBlacklistState(url); } bool URLBlacklistManager::ShouldBlockRequestForFrame(const GURL& url, int* reason) const { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); bool block = false; if (override_blacklist_.Run(url, &block, reason))
diff --git a/components/policy/core/common/async_policy_loader.cc b/components/policy/core/common/async_policy_loader.cc index c99526a..e1df60ee 100644 --- a/components/policy/core/common/async_policy_loader.cc +++ b/components/policy/core/common/async_policy_loader.cc
@@ -41,7 +41,7 @@ } void AsyncPolicyLoader::Reload(bool force) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); TimeDelta delay; Time now = Time::Now(); @@ -80,7 +80,7 @@ } void AsyncPolicyLoader::Init(const UpdateCallback& update_callback) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); DCHECK(update_callback_.is_null()); DCHECK(!update_callback.is_null()); update_callback_ = update_callback; @@ -97,13 +97,13 @@ } void AsyncPolicyLoader::RefreshPolicies(scoped_refptr<SchemaMap> schema_map) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); schema_map_ = schema_map; Reload(true); } void AsyncPolicyLoader::ScheduleNextReload(TimeDelta delay) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); weak_factory_.InvalidateWeakPtrs(); task_runner_->PostDelayedTask(FROM_HERE, base::Bind(&AsyncPolicyLoader::Reload,
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher.cc b/components/policy/core/common/cloud/external_policy_data_fetcher.cc index 62094931..7161c631 100644 --- a/components/policy/core/common/cloud/external_policy_data_fetcher.cc +++ b/components/policy/core/common/cloud/external_policy_data_fetcher.cc
@@ -88,7 +88,7 @@ } ExternalPolicyDataFetcher::~ExternalPolicyDataFetcher() { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); for (JobSet::iterator it = jobs_.begin(); it != jobs_.end(); ++it) CancelJob(*it); } @@ -97,7 +97,7 @@ const GURL& url, int64_t max_size, const FetchCallback& callback) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); Job* job = new Job( url, max_size, base::Bind(&ForwardJobFinished, @@ -113,7 +113,7 @@ } void ExternalPolicyDataFetcher::CancelJob(Job* job) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); DCHECK(jobs_.find(job) != jobs_.end()); jobs_.erase(job); // Post a task that will cancel the |job| in the |backend_|. The |job| is @@ -137,7 +137,7 @@ Job* job, Result result, std::unique_ptr<std::string> data) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); JobSet::iterator it = jobs_.find(job); if (it == jobs_.end()) { // The |job| has been canceled and removed from |jobs_| already. This can @@ -165,7 +165,7 @@ } ExternalPolicyDataFetcherBackend::~ExternalPolicyDataFetcherBackend() { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); } std::unique_ptr<ExternalPolicyDataFetcher> @@ -177,7 +177,7 @@ void ExternalPolicyDataFetcherBackend::StartJob( ExternalPolicyDataFetcher::Job* job) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("external_policy_fetcher", R"( semantics { @@ -220,7 +220,7 @@ void ExternalPolicyDataFetcherBackend::CancelJob( ExternalPolicyDataFetcher::Job* job, const base::Closure& callback) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); for (auto it = job_map_.begin(); it != job_map_.end();) { if (it->second.job == job) { job_map_.erase(it++); @@ -233,7 +233,7 @@ void ExternalPolicyDataFetcherBackend::OnURLFetchComplete( const net::URLFetcher* source) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); auto it = job_map_.find(const_cast<net::URLFetcher*>(source)); if (it == job_map_.end()) { NOTREACHED(); @@ -280,7 +280,7 @@ int64_t current, int64_t total, int64_t current_network_bytes) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); auto it = job_map_.find(source); DCHECK(it != job_map_.end()); if (it == job_map_.end())
diff --git a/components/policy/core/common/cloud/external_policy_data_updater.cc b/components/policy/core/common/cloud/external_policy_data_updater.cc index 0a5c4cc..97324c54 100644 --- a/components/policy/core/common/cloud/external_policy_data_updater.cc +++ b/components/policy/core/common/cloud/external_policy_data_updater.cc
@@ -300,11 +300,11 @@ max_parallel_jobs_(max_parallel_fetches), running_jobs_(0), shutting_down_(false) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); } ExternalPolicyDataUpdater::~ExternalPolicyDataUpdater() { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); shutting_down_ = true; } @@ -312,7 +312,7 @@ const std::string key, const Request& request, const FetchSuccessCallback& callback) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); // Check whether a job exists for this |key| already. FetchJob* job = job_map_[key].get(); @@ -336,7 +336,7 @@ void ExternalPolicyDataUpdater::CancelExternalDataFetch( const std::string& key) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); // If a |job| exists for this |key|, delete it. If the |job| is on the queue, // its WeakPtr will be invalidated and skipped by StartNextJobs(). If |job| is
diff --git a/components/policy/core/common/cloud/policy_header_io_helper.cc b/components/policy/core/common/cloud/policy_header_io_helper.cc index 268ca01..37e866c 100644 --- a/components/policy/core/common/cloud/policy_header_io_helper.cc +++ b/components/policy/core/common/cloud/policy_header_io_helper.cc
@@ -27,7 +27,7 @@ // Sets any necessary policy headers on the passed request. void PolicyHeaderIOHelper::AddPolicyHeaders(const GURL& url, net::URLRequest* request) const { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); if (!policy_header_.empty() && url.spec().compare(0, server_url_.size(), server_url_) == 0) { request->SetExtraRequestHeaderByName(kChromePolicyHeader, @@ -46,7 +46,7 @@ void PolicyHeaderIOHelper::UpdateHeaderOnIOThread( const std::string& new_header) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); policy_header_ = new_header; } @@ -59,7 +59,7 @@ void PolicyHeaderIOHelper::SetServerURLOnIOThread( const std::string& server_url) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); server_url_ = server_url; }
diff --git a/components/policy/core/common/cloud/resource_cache.cc b/components/policy/core/common/cloud/resource_cache.cc index 7fe1da9..1ea0ac7b 100644 --- a/components/policy/core/common/cloud/resource_cache.cc +++ b/components/policy/core/common/cloud/resource_cache.cc
@@ -47,13 +47,13 @@ } ResourceCache::~ResourceCache() { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); } bool ResourceCache::Store(const std::string& key, const std::string& subkey, const std::string& data) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::FilePath subkey_path; // Delete the file before writing to it. This ensures that the write does not // follow a symlink planted at |subkey_path|, clobbering a file outside the @@ -73,7 +73,7 @@ bool ResourceCache::Load(const std::string& key, const std::string& subkey, std::string* data) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::FilePath subkey_path; // Only read from |subkey_path| if it is not a symlink. if (!VerifyKeyPathAndGetSubkeyPath(key, false, subkey, &subkey_path) || @@ -87,7 +87,7 @@ void ResourceCache::LoadAllSubkeys( const std::string& key, std::map<std::string, std::string>* contents) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); contents->clear(); base::FilePath key_path; if (!VerifyKeyPath(key, false, &key_path)) @@ -112,7 +112,7 @@ } void ResourceCache::Delete(const std::string& key, const std::string& subkey) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::FilePath subkey_path; if (VerifyKeyPathAndGetSubkeyPath(key, false, subkey, &subkey_path)) base::DeleteFile(subkey_path, false); @@ -123,7 +123,7 @@ } void ResourceCache::Clear(const std::string& key) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::FilePath key_path; if (VerifyKeyPath(key, false, &key_path)) base::DeleteFile(key_path, true); @@ -131,7 +131,7 @@ void ResourceCache::FilterSubkeys(const std::string& key, const SubkeyFilter& test) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::FilePath key_path; if (!VerifyKeyPath(key, false, &key_path)) @@ -158,7 +158,7 @@ } void ResourceCache::PurgeOtherKeys(const std::set<std::string>& keys_to_keep) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); std::set<std::string> encoded_keys_to_keep; if (!Base64UrlEncode(keys_to_keep, &encoded_keys_to_keep)) return; @@ -176,7 +176,7 @@ void ResourceCache::PurgeOtherSubkeys( const std::string& key, const std::set<std::string>& subkeys_to_keep) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); base::FilePath key_path; if (!VerifyKeyPath(key, false, &key_path)) return;
diff --git a/components/policy/core/common/policy_loader_ios.mm b/components/policy/core/common/policy_loader_ios.mm index 8b0a480..c1c4cca 100644 --- a/components/policy/core/common/policy_loader_ios.mm +++ b/components/policy/core/common/policy_loader_ios.mm
@@ -97,11 +97,11 @@ weak_factory_(this) {} PolicyLoaderIOS::~PolicyLoaderIOS() { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); } void PolicyLoaderIOS::InitOnBackgroundThread() { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); base::Closure callback = base::Bind(&PolicyLoaderIOS::UserDefaultsChanged, weak_factory_.GetWeakPtr()); notification_observer_.reset(
diff --git a/components/safe_browsing_db/v4_database.cc b/components/safe_browsing_db/v4_database.cc index 48eaabe..fc23c9b 100644 --- a/components/safe_browsing_db/v4_database.cc +++ b/components/safe_browsing_db/v4_database.cc
@@ -79,7 +79,7 @@ const scoped_refptr<base::SingleThreadTaskRunner>& callback_task_runner, NewDatabaseReadyCallback new_db_callback, const TimeTicks create_start_time) { - DCHECK(db_task_runner->RunsTasksOnCurrentThread()); + DCHECK(db_task_runner->RunsTasksInCurrentSequence()); if (!g_store_factory.Get()) g_store_factory.Get() = base::MakeUnique<V4StoreFactory>(); @@ -133,7 +133,7 @@ db_task_runner_(db_task_runner), pending_store_updates_(0), weak_factory_on_io_(this) { - DCHECK(db_task_runner->RunsTasksOnCurrentThread()); + DCHECK(db_task_runner->RunsTasksInCurrentSequence()); } // static @@ -147,7 +147,7 @@ } V4Database::~V4Database() { - DCHECK(db_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(db_task_runner_->RunsTasksInCurrentSequence()); } void V4Database::ApplyUpdate(
diff --git a/components/safe_browsing_db/v4_store.cc b/components/safe_browsing_db/v4_store.cc index 5871922..a1bc307 100644 --- a/components/safe_browsing_db/v4_store.cc +++ b/components/safe_browsing_db/v4_store.cc
@@ -203,7 +203,7 @@ task_runner_(task_runner) {} V4Store::~V4Store() { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); } std::string V4Store::DebugString() const { @@ -528,7 +528,7 @@ const HashPrefixMap& additions_map, const RepeatedField<int32>* raw_removals, const std::string& expected_checksum) { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); DCHECK(hash_prefix_map_.empty()); bool calculate_checksum = !expected_checksum.empty(); @@ -660,7 +660,7 @@ } StoreReadResult V4Store::ReadFromDisk() { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); V4StoreFileFormat file_format; int64_t file_size; @@ -796,7 +796,7 @@ } bool V4Store::VerifyChecksum() { - DCHECK(task_runner_->RunsTasksOnCurrentThread()); + DCHECK(task_runner_->RunsTasksInCurrentSequence()); if (expected_checksum_.empty()) { // Nothing to check here folks!
diff --git a/components/sessions/core/base_session_service.cc b/components/sessions/core/base_session_service.cc index 21726d0..e40809f4 100644 --- a/components/sessions/core/base_session_service.cc +++ b/components/sessions/core/base_session_service.cc
@@ -34,7 +34,7 @@ base::TaskRunner* task_runner, const BaseSessionService::GetCommandsCallback& callback, std::vector<std::unique_ptr<SessionCommand>> commands) { - if (task_runner->RunsTasksOnCurrentThread()) { + if (task_runner->RunsTasksInCurrentSequence()) { callback.Run(std::move(commands)); } else { task_runner->PostTask(FROM_HERE,
diff --git a/components/sync/driver/shared_change_processor.cc b/components/sync/driver/shared_change_processor.cc index 6e473b5c..6daadff 100644 --- a/components/sync/driver/shared_change_processor.cc +++ b/components/sync/driver/shared_change_processor.cc
@@ -36,7 +36,7 @@ // |generic_change_processor_|, if non-null, must be deleted on // |backend_task_runner_|. if (backend_task_runner_.get()) { - if (backend_task_runner_->RunsTasksOnCurrentThread()) { + if (backend_task_runner_->RunsTasksInCurrentSequence()) { delete generic_change_processor_; } else { DCHECK(frontend_task_runner_->BelongsToCurrentThread()); @@ -189,7 +189,7 @@ int SharedChangeProcessor::GetSyncCount() { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { LOG(ERROR) << "Change processor disconnected."; @@ -202,7 +202,7 @@ const tracked_objects::Location& from_here, const SyncChangeList& list_of_changes) { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { // The DTC that disconnects us must ensure it posts a StopSyncing task. @@ -225,7 +225,7 @@ ModelType type, SyncDataList* data) const { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { SyncError error(FROM_HERE, SyncError::DATATYPE_ERROR, @@ -240,7 +240,7 @@ SyncChangeProcessor::ContextRefreshStatus refresh_status, const std::string& context) { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { SyncError error(FROM_HERE, SyncError::DATATYPE_ERROR, @@ -254,7 +254,7 @@ void SharedChangeProcessor::AddLocalChangeObserver( LocalChangeObserver* observer) { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); generic_change_processor_->AddLocalChangeObserver(observer); } @@ -262,14 +262,14 @@ void SharedChangeProcessor::RemoveLocalChangeObserver( LocalChangeObserver* observer) { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); generic_change_processor_->RemoveLocalChangeObserver(observer); } bool SharedChangeProcessor::SyncModelHasUserCreatedNodes(bool* has_nodes) { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { LOG(ERROR) << "Change processor disconnected."; @@ -280,7 +280,7 @@ bool SharedChangeProcessor::CryptoReadyIfNecessary() { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { LOG(ERROR) << "Change processor disconnected."; @@ -291,7 +291,7 @@ bool SharedChangeProcessor::GetDataTypeContext(std::string* context) const { DCHECK(backend_task_runner_.get()); - DCHECK(backend_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(backend_task_runner_->RunsTasksInCurrentSequence()); AutoLock lock(monitor_lock_); if (disconnected_) { LOG(ERROR) << "Change processor disconnected.";
diff --git a/components/sync/engine/fake_sync_manager.cc b/components/sync/engine/fake_sync_manager.cc index 2d985b0..13413b4 100644 --- a/components/sync/engine/fake_sync_manager.cc +++ b/components/sync/engine/fake_sync_manager.cc
@@ -190,7 +190,7 @@ } void FakeSyncManager::ShutdownOnSyncThread(ShutdownReason reason) { - DCHECK(sync_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(sync_task_runner_->RunsTasksInCurrentSequence()); test_user_share_.TearDown(); }
diff --git a/components/timers/alarm_timer_chromeos.cc b/components/timers/alarm_timer_chromeos.cc index 601b411..cc550eb 100644 --- a/components/timers/alarm_timer_chromeos.cc +++ b/components/timers/alarm_timer_chromeos.cc
@@ -26,12 +26,12 @@ weak_factory_(this) {} AlarmTimer::~AlarmTimer() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); Stop(); } void AlarmTimer::Stop() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); if (!base::Timer::is_running()) return; @@ -53,7 +53,7 @@ } void AlarmTimer::Reset() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); DCHECK(!base::Timer::user_task().is_null()); if (!CanWakeFromSuspend()) { @@ -107,7 +107,7 @@ } void AlarmTimer::OnAlarmFdReadableWithoutBlocking() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); DCHECK(base::Timer::IsRunning()); // Read from |alarm_fd_| to ack the event. @@ -119,7 +119,7 @@ } void AlarmTimer::OnTimerFired() { - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence()); DCHECK(base::Timer::IsRunning()); DCHECK(pending_task_.get());
diff --git a/components/update_client/background_downloader_win.cc b/components/update_client/background_downloader_win.cc index dcbcd64..a04923bb 100644 --- a/components/update_client/background_downloader_win.cc +++ b/components/update_client/background_downloader_win.cc
@@ -457,7 +457,7 @@ // Called one time when this class is asked to do a download. void BackgroundDownloader::BeginDownload(const GURL& url) { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); download_start_time_ = base::TimeTicks::Now(); job_stuck_begin_time_ = download_start_time_; @@ -503,7 +503,7 @@ // Called any time the timer fires. void BackgroundDownloader::OnDownloading() { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); HRESULT hr = UpdateInterfacePointers(); if (FAILED(hr)) { @@ -568,7 +568,7 @@ // Completes the BITS download, picks up the file path of the response, and // notifies the CrxDownloader. The function should be called only once. void BackgroundDownloader::EndDownload(HRESULT error) { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); const base::TimeTicks download_end_time(base::TimeTicks::Now()); const base::TimeDelta download_time = @@ -709,7 +709,7 @@ // install a job observer but continues on if an observer can't be set up. HRESULT BackgroundDownloader::QueueBitsJob(const GURL& url, IBackgroundCopyJob** job) { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); ScopedComPtr<IBackgroundCopyJob> p; HRESULT hr = CreateOrOpenJob(url, p.GetAddressOf()); @@ -830,7 +830,7 @@ } HRESULT BackgroundDownloader::UpdateInterfacePointers() { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); ScopedComPtr<IGlobalInterfaceTable> git; HRESULT hr = GetGit(&git); @@ -857,7 +857,7 @@ } HRESULT BackgroundDownloader::ClearGit() { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); ResetInterfacePointers();
diff --git a/components/update_client/component.cc b/components/update_client/component.cc index f0e7a7f..bde8b6be 100644 --- a/components/update_client/component.cc +++ b/components/update_client/component.cc
@@ -70,7 +70,7 @@ const std::string& fingerprint, const scoped_refptr<CrxInstaller>& installer, InstallOnBlockingTaskRunnerCompleteCallback callback) { - DCHECK(blocking_task_runner->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner->RunsTasksInCurrentSequence()); if (static_cast<int>(fingerprint.size()) != base::WriteFile( @@ -93,7 +93,7 @@ const std::string& fingerprint, const scoped_refptr<CrxInstaller>& installer, InstallOnBlockingTaskRunnerCompleteCallback callback) { - DCHECK(blocking_task_runner->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner->RunsTasksInCurrentSequence()); DCHECK(base::DirectoryExists(unpack_path)); const auto result = DoInstallOnBlockingTaskRunner( @@ -117,7 +117,7 @@ const scoped_refptr<CrxInstaller>& installer, InstallOnBlockingTaskRunnerCompleteCallback callback, const ComponentUnpacker::Result& result) { - DCHECK(blocking_task_runner->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner->RunsTasksInCurrentSequence()); update_client::DeleteFileAndEmptyParentDirectory(crx_path); @@ -144,7 +144,7 @@ const scoped_refptr<CrxInstaller>& installer, const scoped_refptr<OutOfProcessPatcher>& oop_patcher, InstallOnBlockingTaskRunnerCompleteCallback callback) { - DCHECK(blocking_task_runner->RunsTasksOnCurrentThread()); + DCHECK(blocking_task_runner->RunsTasksInCurrentSequence()); auto unpacker = base::MakeRefCounted<ComponentUnpacker>( pk_hash, crx_path, installer, oop_patcher, blocking_task_runner);
diff --git a/components/update_client/crx_downloader.cc b/components/update_client/crx_downloader.cc index f315933..8437dd5 100644 --- a/components/update_client/crx_downloader.cc +++ b/components/update_client/crx_downloader.cc
@@ -152,7 +152,7 @@ void CrxDownloader::VerifyResponse(bool is_handled, Result result, DownloadMetrics download_metrics) { - DCHECK(task_runner()->RunsTasksOnCurrentThread()); + DCHECK(task_runner()->RunsTasksInCurrentSequence()); DCHECK_EQ(0, result.error); DCHECK_EQ(0, download_metrics.error); DCHECK(is_handled);
diff --git a/components/update_client/url_request_post_interceptor.cc b/components/update_client/url_request_post_interceptor.cc index acd75d5..50bf037 100644 --- a/components/update_client/url_request_post_interceptor.cc +++ b/components/update_client/url_request_post_interceptor.cc
@@ -67,7 +67,7 @@ } URLRequestPostInterceptor::~URLRequestPostInterceptor() { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); ClearExpectations(); } @@ -154,13 +154,13 @@ : scheme_(scheme), hostname_(hostname), io_task_runner_(io_task_runner) {} void Register() { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); net::URLRequestFilter::GetInstance()->AddHostnameInterceptor( scheme_, hostname_, std::unique_ptr<net::URLRequestInterceptor>(this)); } void Unregister() { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); for (InterceptorMap::iterator it = interceptors_.begin(); it != interceptors_.end(); ++it) delete (*it).second; @@ -169,7 +169,7 @@ } void OnCreateInterceptor(URLRequestPostInterceptor* interceptor) { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); DCHECK(interceptors_.find(interceptor->GetUrl()) == interceptors_.end()); interceptors_.insert(std::make_pair(interceptor->GetUrl(), interceptor)); @@ -181,7 +181,7 @@ net::URLRequestJob* MaybeInterceptRequest( net::URLRequest* request, net::NetworkDelegate* network_delegate) const override { - DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); + DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); // Only intercepts POST. if (!request->has_upload())
diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc index 20818081..1fdcb558 100644 --- a/components/user_manager/user_manager_base.cc +++ b/components/user_manager/user_manager_base.cc
@@ -105,7 +105,7 @@ } void UserManagerBase::Shutdown() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); } const UserList& UserManagerBase::GetUsers() const { @@ -128,7 +128,7 @@ void UserManagerBase::UserLoggedIn(const AccountId& account_id, const std::string& username_hash, bool browser_restart) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (!last_session_active_account_id_initialized_) { last_session_active_account_id_ = @@ -259,14 +259,14 @@ } void UserManagerBase::OnSessionStarted() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); CallUpdateLoginState(); GetLocalState()->CommitPendingWrite(); } void UserManagerBase::OnProfileInitialized(User* user) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); // Mark the user as having an initialized session and persist this in // the known_user DB. @@ -277,7 +277,7 @@ void UserManagerBase::RemoveUser(const AccountId& account_id, RemoveUserDelegate* delegate) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (!CanUserBeRemoved(FindUser(account_id))) return; @@ -302,7 +302,7 @@ } void UserManagerBase::RemoveUserFromList(const AccountId& account_id) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); RemoveNonCryptohomeData(account_id); if (user_loading_stage_ == STAGE_LOADED) { DeleteUser(RemoveRegularOrSupervisedUserFromList(account_id)); @@ -328,38 +328,38 @@ } const User* UserManagerBase::FindUser(const AccountId& account_id) const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (active_user_ && active_user_->GetAccountId() == account_id) return active_user_; return FindUserInList(account_id); } User* UserManagerBase::FindUserAndModify(const AccountId& account_id) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (active_user_ && active_user_->GetAccountId() == account_id) return active_user_; return FindUserInListAndModify(account_id); } const User* UserManagerBase::GetActiveUser() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return active_user_; } User* UserManagerBase::GetActiveUser() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return active_user_; } const User* UserManagerBase::GetPrimaryUser() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return primary_user_; } void UserManagerBase::SaveUserOAuthStatus( const AccountId& account_id, User::OAuthTokenStatus oauth_token_status) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); DVLOG(1) << "Saving user OAuth token status in Local State"; User* user = FindUserAndModify(account_id); @@ -382,7 +382,7 @@ void UserManagerBase::SaveForceOnlineSignin(const AccountId& account_id, bool force_online_signin) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); // Do not update local state if data stored or cached outside the user's // cryptohome is to be treated as ephemeral. @@ -400,7 +400,7 @@ void UserManagerBase::SaveUserDisplayName(const AccountId& account_id, const base::string16& display_name) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (User* user = FindUserAndModify(account_id)) { user->set_display_name(display_name); @@ -424,7 +424,7 @@ void UserManagerBase::SaveUserDisplayEmail(const AccountId& account_id, const std::string& display_email) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); User* user = FindUserAndModify(account_id); if (!user) { @@ -452,7 +452,7 @@ void UserManagerBase::SaveUserType(const AccountId& account_id, const UserType& user_type) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); User* user = FindUserAndModify(account_id); if (!user) { @@ -474,7 +474,7 @@ void UserManagerBase::UpdateUserAccountData( const AccountId& account_id, const UserAccountData& account_data) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); SaveUserDisplayName(account_id, account_data.display_name()); @@ -517,76 +517,76 @@ } bool UserManagerBase::IsCurrentUserOwner() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return !owner_account_id_.empty() && active_user_ && active_user_->GetAccountId() == owner_account_id_; } bool UserManagerBase::IsCurrentUserNew() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return is_current_user_new_; } bool UserManagerBase::IsCurrentUserNonCryptohomeDataEphemeral() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && IsUserNonCryptohomeDataEphemeral(GetActiveUser()->GetAccountId()); } bool UserManagerBase::IsCurrentUserCryptohomeDataEphemeral() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && IsUserCryptohomeDataEphemeral(GetActiveUser()->GetAccountId()); } bool UserManagerBase::CanCurrentUserLock() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->can_lock(); } bool UserManagerBase::IsUserLoggedIn() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return active_user_; } bool UserManagerBase::IsLoggedInAsUserWithGaiaAccount() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->HasGaiaAccount(); } bool UserManagerBase::IsLoggedInAsChildUser() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_CHILD; } bool UserManagerBase::IsLoggedInAsPublicAccount() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_PUBLIC_ACCOUNT; } bool UserManagerBase::IsLoggedInAsGuest() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_GUEST; } bool UserManagerBase::IsLoggedInAsSupervisedUser() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_SUPERVISED; } bool UserManagerBase::IsLoggedInAsKioskApp() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_KIOSK_APP; } bool UserManagerBase::IsLoggedInAsArcKioskApp() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_ARC_KIOSK_APP; } bool UserManagerBase::IsLoggedInAsStub() const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); return IsUserLoggedIn() && IsStubAccountId(active_user_->GetAccountId()); } @@ -648,41 +648,41 @@ } void UserManagerBase::AddObserver(UserManager::Observer* obs) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); observer_list_.AddObserver(obs); } void UserManagerBase::RemoveObserver(UserManager::Observer* obs) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); observer_list_.RemoveObserver(obs); } void UserManagerBase::AddSessionStateObserver( UserManager::UserSessionStateObserver* obs) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); session_state_observer_list_.AddObserver(obs); } void UserManagerBase::RemoveSessionStateObserver( UserManager::UserSessionStateObserver* obs) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); session_state_observer_list_.RemoveObserver(obs); } void UserManagerBase::NotifyLocalStateChanged() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : observer_list_) observer.LocalStateChanged(this); } void UserManagerBase::NotifyUserImageChanged(const User& user) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : observer_list_) observer.OnUserImageChanged(user); } void UserManagerBase::NotifyUserProfileImageUpdateFailed(const User& user) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : observer_list_) observer.OnUserProfileImageUpdateFailed(user); } @@ -690,7 +690,7 @@ void UserManagerBase::NotifyUserProfileImageUpdated( const User& user, const gfx::ImageSkia& profile_image) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : observer_list_) observer.OnUserProfileImageUpdated(user, profile_image); } @@ -752,7 +752,7 @@ } void UserManagerBase::EnsureUsersLoaded() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (!GetLocalState()) return; @@ -863,7 +863,7 @@ } void UserManagerBase::GuestUserLoggedIn() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); active_user_ = User::CreateGuestUser(GetGuestAccountId()); } @@ -898,14 +898,14 @@ void UserManagerBase::RegularUserLoggedInAsEphemeral( const AccountId& account_id) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); SetIsCurrentUserNew(true); is_current_user_ephemeral_regular_user_ = true; active_user_ = User::CreateRegularUser(account_id); } void UserManagerBase::NotifyOnLogin() { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); NotifyActiveUserHashChanged(active_user_->username_hash()); NotifyActiveUserChanged(active_user_); @@ -914,7 +914,7 @@ User::OAuthTokenStatus UserManagerBase::LoadUserOAuthStatus( const AccountId& account_id) const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); const base::DictionaryValue* prefs_oauth_status = GetLocalState()->GetDictionary(kUserOAuthTokenStatus); @@ -932,7 +932,7 @@ } bool UserManagerBase::LoadForceOnlineSignin(const AccountId& account_id) const { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); const base::DictionaryValue* prefs_force_online = GetLocalState()->GetDictionary(kUserForceOnlineSignin); @@ -997,26 +997,26 @@ } void UserManagerBase::NotifyActiveUserChanged(const User* active_user) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : session_state_observer_list_) observer.ActiveUserChanged(active_user); } void UserManagerBase::NotifyUserAddedToSession(const User* added_user, bool user_switch_pending) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : session_state_observer_list_) observer.UserAddedToSession(added_user); } void UserManagerBase::NotifyActiveUserHashChanged(const std::string& hash) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); for (auto& observer : session_state_observer_list_) observer.ActiveUserHashChanged(hash); } void UserManagerBase::ChangeUserChildStatus(User* user, bool is_child) { - DCHECK(!task_runner_ || task_runner_->RunsTasksOnCurrentThread()); + DCHECK(!task_runner_ || task_runner_->RunsTasksInCurrentSequence()); if (user->IsSupervised() == is_child) return; user->SetIsChild(is_child);
diff --git a/components/wallpaper/wallpaper_resizer.cc b/components/wallpaper/wallpaper_resizer.cc index 0bfa3d46..bd215df5 100644 --- a/components/wallpaper/wallpaper_resizer.cc +++ b/components/wallpaper/wallpaper_resizer.cc
@@ -34,7 +34,7 @@ WallpaperLayout layout, SkBitmap* resized_bitmap_out, base::TaskRunner* task_runner) { - DCHECK(task_runner->RunsTasksOnCurrentThread()); + DCHECK(task_runner->RunsTasksInCurrentSequence()); SkBitmap orig_bitmap = *image.bitmap(); SkBitmap new_bitmap = orig_bitmap;