Replace tracked_objects::Location with base::Location.
Part 1/4 to replace these namespace qualifications.
[email protected]
[email protected] for chromeos/network
Bug: 763556
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I06ec01e1805744a7bba244b35ed09ace7af3152a
Reviewed-on: https://chromium-review.googlesource.com/662560
Commit-Queue: Brett Wilson <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Brett Wilson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#501189}diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
index 8e8071b..aa7ce57 100644
--- a/chrome/browser/after_startup_task_utils.cc
+++ b/chrome/browser/after_startup_task_utils.cc
@@ -34,13 +34,13 @@
namespace {
struct AfterStartupTask {
- AfterStartupTask(const tracked_objects::Location& from_here,
+ AfterStartupTask(const base::Location& from_here,
const scoped_refptr<base::TaskRunner>& task_runner,
base::OnceClosure task)
: from_here(from_here), task_runner(task_runner), task(std::move(task)) {}
~AfterStartupTask() {}
- const tracked_objects::Location from_here;
+ const base::Location from_here;
const scoped_refptr<base::TaskRunner> task_runner;
base::OnceClosure task;
};
@@ -71,7 +71,7 @@
const int kMinDelaySec = 0;
const int kMaxDelaySec = 10;
scoped_refptr<base::TaskRunner> target_runner = queued_task->task_runner;
- tracked_objects::Location from_here = queued_task->from_here;
+ base::Location from_here = queued_task->from_here;
target_runner->PostDelayedTask(
from_here, base::BindOnce(&RunTask, base::Passed(std::move(queued_task))),
base::TimeDelta::FromSeconds(base::RandInt(kMinDelaySec, kMaxDelaySec)));
@@ -215,7 +215,7 @@
AfterStartupTaskUtils::Runner::~Runner() = default;
bool AfterStartupTaskUtils::Runner::PostDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
DCHECK(delay.is_zero());
@@ -234,7 +234,7 @@
}
void AfterStartupTaskUtils::PostTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const scoped_refptr<base::TaskRunner>& destination_runner,
base::OnceClosure task) {
if (IsBrowserStartupComplete()) {
diff --git a/chrome/browser/after_startup_task_utils.h b/chrome/browser/after_startup_task_utils.h
index 95323525..e9c039c 100644
--- a/chrome/browser/after_startup_task_utils.h
+++ b/chrome/browser/after_startup_task_utils.h
@@ -25,7 +25,7 @@
explicit Runner(scoped_refptr<base::TaskRunner> destination_runner);
// Overrides from base::TaskRunner:
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
@@ -45,7 +45,7 @@
// for chrome. Tasks are queued until startup is complete.
// Note: see browser_thread.h
static void PostTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const scoped_refptr<base::TaskRunner>& destination_runner,
base::OnceClosure task);
diff --git a/chrome/browser/after_startup_task_utils_unittest.cc b/chrome/browser/after_startup_task_utils_unittest.cc
index ff0a88a5..6f31639 100644
--- a/chrome/browser/after_startup_task_utils_unittest.cc
+++ b/chrome/browser/after_startup_task_utils_unittest.cc
@@ -24,7 +24,7 @@
explicit WrappedTaskRunner(scoped_refptr<TaskRunner> real_runner)
: real_task_runner_(std::move(real_runner)) {}
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
++posted_task_count_;
@@ -91,7 +91,7 @@
// Hop to the background sequence and call PostAfterStartupTask.
void PostAfterStartupTaskFromBackgroundSequence(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
scoped_refptr<base::TaskRunner> task_runner,
base::OnceClosure task) {
base::RunLoop run_loop;
diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc
index a1902ca..85d38d0a 100644
--- a/chrome/browser/android/vr_shell/vr_shell.cc
+++ b/chrome/browser/android/vr_shell/vr_shell.cc
@@ -260,7 +260,7 @@
g_instance = nullptr;
}
-void VrShell::PostToGlThread(const tracked_objects::Location& from_here,
+void VrShell::PostToGlThread(const base::Location& from_here,
const base::Closure& task) {
gl_thread_->message_loop()->task_runner()->PostTask(from_here, task);
}
diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
index a7eae86..cdc7886c 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -207,7 +207,7 @@
private:
~VrShell() override;
- void PostToGlThread(const tracked_objects::Location& from_here,
+ void PostToGlThread(const base::Location& from_here,
const base::Closure& task);
void SetUiState();
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index d4c0cf59..82a5d58 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -906,7 +906,7 @@
}
void ChromeContentBrowserClient::PostAfterStartupTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const scoped_refptr<base::TaskRunner>& task_runner,
base::OnceClosure task) {
AfterStartupTaskUtils::PostTask(from_here, task_runner, std::move(task));
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 6b861b2..450623b 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -72,7 +72,7 @@
content::BrowserMainParts* CreateBrowserMainParts(
const content::MainFunctionParams& parameters) override;
- void PostAfterStartupTask(const tracked_objects::Location& from_here,
+ void PostAfterStartupTask(const base::Location& from_here,
const scoped_refptr<base::TaskRunner>& task_runner,
base::OnceClosure task) override;
bool IsBrowserStartupComplete() override;
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer.cc
index 5b3b4a78..c3579514 100644
--- a/chrome/browser/chromeos/attestation/attestation_policy_observer.cc
+++ b/chrome/browser/chromeos/attestation/attestation_policy_observer.cc
@@ -51,7 +51,7 @@
void DBusBoolRedirectCallback(const base::Closure& on_true,
const base::Closure& on_false,
const base::Closure& on_failure,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
chromeos::DBusMethodCallStatus status,
bool value) {
if (status != chromeos::DBUS_METHOD_CALL_SUCCESS) {
@@ -76,7 +76,7 @@
void DBusStringCallback(
const base::Callback<void(const std::string&)> on_success,
const base::Closure& on_failure,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
chromeos::DBusMethodCallStatus status,
bool result,
const std::string& data) {
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
index a04b029..1dcb01e 100644
--- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
@@ -39,7 +39,7 @@
private:
// base::TaskRunner overrides.
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
std::move(task).Run();
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.cc b/chrome/browser/chromeos/login/users/mock_user_manager.cc
index ce927cd..0ead43d 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.cc
@@ -12,7 +12,7 @@
class FakeTaskRunner : public base::TaskRunner {
public:
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
std::move(task).Run();
diff --git a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
index 81c8c05..c8bf905 100644
--- a/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
+++ b/chrome/browser/chromeos/platform_keys/platform_keys_nss.cc
@@ -80,7 +80,7 @@
// Called if an error occurred during the execution of the NSS operation
// described by this object.
- virtual void OnError(const tracked_objects::Location& from,
+ virtual void OnError(const base::Location& from,
const std::string& error_message) = 0;
crypto::ScopedPK11Slot slot_;
@@ -163,12 +163,12 @@
const subtle::GenerateKeyCallback& callback);
~GenerateRSAKeyState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from, std::string() /* no public key */, error_message);
}
- void CallBack(const tracked_objects::Location& from,
+ void CallBack(const base::Location& from,
const std::string& public_key_spki_der,
const std::string& error_message) {
origin_task_runner_->PostTask(
@@ -191,12 +191,12 @@
const subtle::SignCallback& callback);
~SignRSAState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from, std::string() /* no signature */, error_message);
}
- void CallBack(const tracked_objects::Location& from,
+ void CallBack(const base::Location& from,
const std::string& signature,
const std::string& error_message) {
origin_task_runner_->PostTask(
@@ -232,13 +232,13 @@
const subtle::SelectCertificatesCallback& callback);
~SelectCertificatesState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from, std::unique_ptr<net::CertificateList>() /* no matches */,
error_message);
}
- void CallBack(const tracked_objects::Location& from,
+ void CallBack(const base::Location& from,
std::unique_ptr<net::CertificateList> matches,
const std::string& error_message) {
origin_task_runner_->PostTask(
@@ -260,14 +260,14 @@
explicit GetCertificatesState(const GetCertificatesCallback& callback);
~GetCertificatesState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from,
std::unique_ptr<net::CertificateList>() /* no certificates */,
error_message);
}
- void CallBack(const tracked_objects::Location& from,
+ void CallBack(const base::Location& from,
std::unique_ptr<net::CertificateList> certs,
const std::string& error_message) {
origin_task_runner_->PostTask(
@@ -287,13 +287,12 @@
const ImportCertificateCallback& callback);
~ImportCertificateState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from, error_message);
}
- void CallBack(const tracked_objects::Location& from,
- const std::string& error_message) {
+ void CallBack(const base::Location& from, const std::string& error_message) {
origin_task_runner_->PostTask(from, base::Bind(callback_, error_message));
}
@@ -310,13 +309,12 @@
const RemoveCertificateCallback& callback);
~RemoveCertificateState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from, error_message);
}
- void CallBack(const tracked_objects::Location& from,
- const std::string& error_message) {
+ void CallBack(const base::Location& from, const std::string& error_message) {
origin_task_runner_->PostTask(from, base::Bind(callback_, error_message));
}
@@ -332,14 +330,14 @@
explicit GetTokensState(const GetTokensCallback& callback);
~GetTokensState() override {}
- void OnError(const tracked_objects::Location& from,
+ void OnError(const base::Location& from,
const std::string& error_message) override {
CallBack(from,
std::unique_ptr<std::vector<std::string>>() /* no token ids */,
error_message);
}
- void CallBack(const tracked_objects::Location& from,
+ void CallBack(const base::Location& from,
std::unique_ptr<std::vector<std::string>> token_ids,
const std::string& error_message) {
origin_task_runner_->PostTask(
diff --git a/chrome/browser/data_usage/tab_id_provider.cc b/chrome/browser/data_usage/tab_id_provider.cc
index 52debf16..3d49f13 100644
--- a/chrome/browser/data_usage/tab_id_provider.cc
+++ b/chrome/browser/data_usage/tab_id_provider.cc
@@ -76,7 +76,7 @@
};
TabIdProvider::TabIdProvider(base::TaskRunner* task_runner,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const TabIdGetter& tab_id_getter)
: is_tab_info_ready_(false), tab_info_(-1), weak_ptr_factory_(this) {
std::unique_ptr<CallbackRunner> callback_runner(new CallbackRunner());
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 2e8594e7..3141855 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -107,7 +107,7 @@
// syncer::SyncChangeProcessor implementation.
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override {
if (fail_all_requests_) {
return syncer::SyncError(
@@ -256,7 +256,7 @@
}
template <typename Func>
- void PostOnBackendSequenceAndWait(const tracked_objects::Location& from_here,
+ void PostOnBackendSequenceAndWait(const base::Location& from_here,
Func func) {
GetBackendTaskRunner()->PostTask(
from_here, base::Bind(&ExtensionSettingsSyncTest::RunFunc<Func>, func));
diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.cc b/chrome/browser/extensions/api/storage/sync_storage_backend.cc
index 86aa995..73ab825 100644
--- a/chrome/browser/extensions/api/storage/sync_storage_backend.cc
+++ b/chrome/browser/extensions/api/storage/sync_storage_backend.cc
@@ -227,7 +227,7 @@
}
syncer::SyncError SyncStorageBackend::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& sync_changes) {
DCHECK(IsOnBackendSequence());
DCHECK(sync_processor_.get());
diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.h b/chrome/browser/extensions/api/storage/sync_storage_backend.h
index e3b61ed..6eeaadb 100644
--- a/chrome/browser/extensions/api/storage/sync_storage_backend.h
+++ b/chrome/browser/extensions/api/storage/sync_storage_backend.h
@@ -55,7 +55,7 @@
std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
void StopSyncing(syncer::ModelType type) override;
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc
index cd1ac904..ba2d365 100644
--- a/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -148,7 +148,7 @@
// the FakeSyncChangeProcessor's SyncDataList as a map keyed by extension
// id.
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override {
syncer::FakeSyncChangeProcessor::ProcessSyncChanges(from_here, change_list);
for (const auto& change : change_list) {
diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc
index 27685b7..d30af03 100644
--- a/chrome/browser/extensions/extension_sync_service.cc
+++ b/chrome/browser/extensions/extension_sync_service.cc
@@ -252,7 +252,7 @@
}
syncer::SyncError ExtensionSyncService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
for (const syncer::SyncChange& sync_change : change_list) {
std::unique_ptr<ExtensionSyncData> extension_sync_data(
diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h
index 413a49e0..efa3be4 100644
--- a/chrome/browser/extensions/extension_sync_service.h
+++ b/chrome/browser/extensions/extension_sync_service.h
@@ -62,7 +62,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
void SetSyncStartFlareForTesting(
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
index 0990e47..ee97a4236 100644
--- a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
+++ b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
@@ -367,13 +367,9 @@
MTPDeviceDelegateImplLinux::PendingTaskInfo::PendingTaskInfo(
const base::FilePath& path,
content::BrowserThread::ID thread_id,
- const tracked_objects::Location& location,
+ const base::Location& location,
const base::Closure& task)
- : path(path),
- thread_id(thread_id),
- location(location),
- task(task) {
-}
+ : path(path), thread_id(thread_id), location(location), task(task) {}
MTPDeviceDelegateImplLinux::PendingTaskInfo::PendingTaskInfo(
const PendingTaskInfo& other) = default;
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h
index 3bd4773a..31c12d06 100644
--- a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h
+++ b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h
@@ -48,7 +48,7 @@
struct PendingTaskInfo {
PendingTaskInfo(const base::FilePath& path,
content::BrowserThread::ID thread_id,
- const tracked_objects::Location& location,
+ const base::Location& location,
const base::Closure& task);
PendingTaskInfo(const PendingTaskInfo& other);
~PendingTaskInfo();
@@ -56,7 +56,7 @@
base::FilePath path;
base::FilePath cached_path;
const content::BrowserThread::ID thread_id;
- const tracked_objects::Location location;
+ const base::Location location;
const base::Closure task;
};
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc
index 9de2e33c..76d2560 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc
@@ -350,13 +350,10 @@
}
MTPDeviceDelegateImplWin::PendingTaskInfo::PendingTaskInfo(
- const tracked_objects::Location& location,
+ const base::Location& location,
const base::Callback<base::File::Error(void)>& task,
const base::Callback<void(base::File::Error)>& reply)
- : location(location),
- task(task),
- reply(reply) {
-}
+ : location(location), task(task), reply(reply) {}
MTPDeviceDelegateImplWin::PendingTaskInfo::PendingTaskInfo(
const PendingTaskInfo& other) = default;
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
index c1f7b24..becddda 100644
--- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
+++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
@@ -73,13 +73,13 @@
// Used to represent pending task details.
struct PendingTaskInfo {
- PendingTaskInfo(const tracked_objects::Location& location,
+ PendingTaskInfo(const base::Location& location,
const base::Callback<base::File::Error(void)>& task,
const base::Callback<void(base::File::Error)>& reply);
PendingTaskInfo(const PendingTaskInfo& other);
~PendingTaskInfo();
- const tracked_objects::Location location;
+ const base::Location location;
const base::Callback<base::File::Error(void)> task;
const base::Callback<void(base::File::Error)> reply;
};
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index 10dc904..fce991e 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -744,23 +744,22 @@
}
// static
-bool WatchDogThread::PostTask(const tracked_objects::Location& from_here,
+bool WatchDogThread::PostTask(const base::Location& from_here,
const base::Closure& task) {
return PostTaskHelper(from_here, task, base::TimeDelta());
}
// static
-bool WatchDogThread::PostDelayedTask(const tracked_objects::Location& from_here,
+bool WatchDogThread::PostDelayedTask(const base::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) {
return PostTaskHelper(from_here, task, delay);
}
// static
-bool WatchDogThread::PostTaskHelper(
- const tracked_objects::Location& from_here,
- const base::Closure& task,
- base::TimeDelta delay) {
+bool WatchDogThread::PostTaskHelper(const base::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) {
{
base::AutoLock lock(g_watchdog_lock.Get());
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index 4a50cff..69451fa6 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -576,9 +576,9 @@
// They return true iff the watchdog thread existed and the task was posted.
// Note that even if the task is posted, there's no guarantee that it will
// run, since the target thread may already have a Quit message in its queue.
- static bool PostTask(const tracked_objects::Location& from_here,
+ static bool PostTask(const base::Location& from_here,
const base::Closure& task);
- static bool PostDelayedTask(const tracked_objects::Location& from_here,
+ static bool PostDelayedTask(const base::Location& from_here,
const base::Closure& task,
base::TimeDelta delay);
@@ -590,10 +590,9 @@
// This method returns true if Init() is called.
bool Started() const;
- static bool PostTaskHelper(
- const tracked_objects::Location& from_here,
- const base::Closure& task,
- base::TimeDelta delay);
+ static bool PostTaskHelper(const base::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay);
DISALLOW_COPY_AND_ASSIGN(WatchDogThread);
};
diff --git a/chrome/browser/notifications/notification_permission_context.cc b/chrome/browser/notifications/notification_permission_context.cc
index d3cd3690..f242f0f 100644
--- a/chrome/browser/notifications/notification_permission_context.cc
+++ b/chrome/browser/notifications/notification_permission_context.cc
@@ -36,7 +36,7 @@
// Runs |task| after the WebContents has been visible for a consecutive
// duration of at least |visible_delay|.
- void PostTaskAfterVisibleDelay(const tracked_objects::Location& from_here,
+ void PostTaskAfterVisibleDelay(const base::Location& from_here,
const base::Closure& task,
base::TimeDelta visible_delay,
const PermissionRequestID& id);
@@ -98,7 +98,7 @@
}
void VisibilityTimerTabHelper::PostTaskAfterVisibleDelay(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task,
base::TimeDelta visible_delay,
const PermissionRequestID& id) {
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
index c0b285d4..a8ea05a 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
@@ -184,7 +184,7 @@
}
void ResourcePrefetchPredictorTables::ScheduleDBTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
DBTask task) {
GetTaskRunner()->PostTask(
from_here,
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
index 70b8654f..798d8d0 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
@@ -69,8 +69,7 @@
scoped_refptr<base::SequencedTaskRunner> db_task_runner)
: ResourcePrefetchPredictorTables(std::move(db_task_runner)) {}
- void ScheduleDBTask(const tracked_objects::Location& from_here,
- DBTask task) override {
+ void ScheduleDBTask(const base::Location& from_here, DBTask task) override {
ExecuteDBTaskOnDBSequence(std::move(task));
}
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index a884d98..445e383 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -353,7 +353,7 @@
return thread_.IsRunning();
}
-bool PrintJobWorker::PostTask(const tracked_objects::Location& from_here,
+bool PrintJobWorker::PostTask(const base::Location& from_here,
const base::Closure& task) {
if (task_runner_.get())
return task_runner_->PostTask(from_here, task);
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index f11ae6b..e5a63ee5 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -75,8 +75,7 @@
bool IsRunning() const;
// Posts the given task to be run.
- bool PostTask(const tracked_objects::Location& from_here,
- const base::Closure& task);
+ bool PostTask(const base::Location& from_here, const base::Closure& task);
// Signals the thread to exit in the near future.
void StopSoon();
diff --git a/chrome/browser/printing/print_job_worker_owner.cc b/chrome/browser/printing/print_job_worker_owner.cc
index ea08de2..60b8473 100644
--- a/chrome/browser/printing/print_job_worker_owner.cc
+++ b/chrome/browser/printing/print_job_worker_owner.cc
@@ -20,7 +20,7 @@
return task_runner_->RunsTasksInCurrentSequence();
}
-bool PrintJobWorkerOwner::PostTask(const tracked_objects::Location& from_here,
+bool PrintJobWorkerOwner::PostTask(const base::Location& from_here,
const base::Closure& task) {
return task_runner_->PostTask(from_here, task);
}
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index 09d5d8f..1a5341ed 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -84,7 +84,7 @@
return profile_path;
}
- void SetupDefaultProfileShortcut(const tracked_objects::Location& location) {
+ void SetupDefaultProfileShortcut(const base::Location& location) {
ASSERT_EQ(0u, profile_attributes_storage_->GetNumberOfProfiles())
<< location.ToString();
ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_1_name_))
@@ -100,7 +100,7 @@
ValidateNonProfileShortcut(location);
}
- void SetupAndCreateTwoShortcuts(const tracked_objects::Location& location) {
+ void SetupAndCreateTwoShortcuts(const base::Location& location) {
SetupDefaultProfileShortcut(location);
CreateProfileWithShortcut(location, profile_2_name_, profile_2_path_);
ValidateProfileShortcut(location, profile_1_name_, profile_1_path_);
@@ -122,7 +122,7 @@
// Posts a task to call base::win::ValidateShortcut on the COM thread.
void PostValidateShortcut(
- const tracked_objects::Location& location,
+ const base::Location& location,
const base::FilePath& shortcut_path,
const base::win::ShortcutProperties& expected_properties) {
base::CreateCOMSTATaskRunnerWithTraits({})->PostTask(
@@ -133,7 +133,7 @@
// Calls base::win::ValidateShortcut() with expected properties for the
// shortcut at |shortcut_path| for the profile at |profile_path|.
- void ValidateProfileShortcutAtPath(const tracked_objects::Location& location,
+ void ValidateProfileShortcutAtPath(const base::Location& location,
const base::FilePath& shortcut_path,
const base::FilePath& profile_path) {
EXPECT_TRUE(base::PathExists(shortcut_path)) << location.ToString();
@@ -157,16 +157,15 @@
// Calls base::win::ValidateShortcut() with expected properties for
// |profile_name|'s shortcut.
- void ValidateProfileShortcut(const tracked_objects::Location& location,
+ void ValidateProfileShortcut(const base::Location& location,
const base::string16& profile_name,
const base::FilePath& profile_path) {
ValidateProfileShortcutAtPath(
location, GetDefaultShortcutPathForProfile(profile_name), profile_path);
}
- void ValidateNonProfileShortcutAtPath(
- const tracked_objects::Location& location,
- const base::FilePath& shortcut_path) {
+ void ValidateNonProfileShortcutAtPath(const base::Location& location,
+ const base::FilePath& shortcut_path) {
EXPECT_TRUE(base::PathExists(shortcut_path)) << location.ToString();
base::win::ShortcutProperties expected_properties;
@@ -178,13 +177,13 @@
PostValidateShortcut(location, shortcut_path, expected_properties);
}
- void ValidateNonProfileShortcut(const tracked_objects::Location& location) {
+ void ValidateNonProfileShortcut(const base::Location& location) {
const base::FilePath shortcut_path =
GetDefaultShortcutPathForProfile(base::string16());
ValidateNonProfileShortcutAtPath(location, shortcut_path);
}
- void CreateProfileWithShortcut(const tracked_objects::Location& location,
+ void CreateProfileWithShortcut(const base::Location& location,
const base::string16& profile_name,
const base::FilePath& profile_path) {
ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_name))
@@ -199,7 +198,7 @@
// Posts a task to call ShellUtil::CreateOrUpdateShortcut on the COM thread.
void PostCreateOrUpdateShortcut(
- const tracked_objects::Location& location,
+ const base::Location& location,
const ShellUtil::ShortcutProperties& properties) {
base::PostTaskAndReplyWithResult(
base::CreateCOMSTATaskRunnerWithTraits({base::MayBlock()}).get(),
@@ -214,7 +213,7 @@
// Creates a regular (non-profile) desktop shortcut with the given name and
// returns its path. Fails the test if an error occurs.
base::FilePath CreateRegularShortcutWithName(
- const tracked_objects::Location& location,
+ const base::Location& location,
const base::string16& shortcut_name) {
const base::FilePath shortcut_path =
GetUserShortcutsDirectory().Append(shortcut_name + installer::kLnkExt);
@@ -231,7 +230,7 @@
}
base::FilePath CreateRegularSystemLevelShortcut(
- const tracked_objects::Location& location) {
+ const base::Location& location) {
BrowserDistribution* distribution = GetDistribution();
installer::Product product(distribution);
ShellUtil::ShortcutProperties properties(ShellUtil::SYSTEM_LEVEL);
@@ -245,7 +244,7 @@
return system_level_shortcut_path;
}
- void RenameProfile(const tracked_objects::Location& location,
+ void RenameProfile(const base::Location& location,
const base::FilePath& profile_path,
const base::string16& new_profile_name) {
ProfileAttributesEntry* entry;
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index 5309ac9..67664e18 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -100,7 +100,7 @@
// Store a copy of all the changes passed in so we can examine them later.
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override {
@@ -135,7 +135,7 @@
}
syncer::SyncError TestChangeProcessor::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
if (erroneous_)
return syncer::SyncError(
diff --git a/chrome/browser/sessions/session_service_test_helper.cc b/chrome/browser/sessions/session_service_test_helper.cc
index f48bda8..6b0492c6 100644
--- a/chrome/browser/sessions/session_service_test_helper.cc
+++ b/chrome/browser/sessions/session_service_test_helper.cc
@@ -117,7 +117,7 @@
}
void SessionServiceTestHelper::RunTaskOnBackendThread(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task) {
sessions::BaseSessionServiceTestHelper test_helper(
service_->GetBaseSessionServiceForTest());
diff --git a/chrome/browser/sessions/session_service_test_helper.h b/chrome/browser/sessions/session_service_test_helper.h
index 8edfa77..273da262 100644
--- a/chrome/browser/sessions/session_service_test_helper.h
+++ b/chrome/browser/sessions/session_service_test_helper.h
@@ -76,7 +76,7 @@
SessionService* ReleaseService();
SessionService* service() { return service_.get(); }
- void RunTaskOnBackendThread(const tracked_objects::Location& from_here,
+ void RunTaskOnBackendThread(const base::Location& from_here,
const base::Closure& task);
private:
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
index 16188145..7667a71 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
@@ -346,7 +346,7 @@
}
syncer::SyncError SpellcheckCustomDictionary::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::unique_ptr<Change> dictionary_change(new Change);
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
index 8c9c19e..ec7e30e8 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -125,9 +125,8 @@
~SyncErrorFactoryStub() override {}
// Overridden from syncer::SyncErrorFactory:
- syncer::SyncError CreateAndUploadError(
- const tracked_objects::Location& location,
- const std::string& message) override {
+ syncer::SyncError CreateAndUploadError(const base::Location& location,
+ const std::string& message) override {
(*error_counter_)++;
return syncer::SyncError(location,
syncer::SyncError::DATATYPE_ERROR,
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
index ee5a7093..76cd64b 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
@@ -54,7 +54,7 @@
~MockChangeProcessor() override {}
// SyncChangeProcessor implementation:
- SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
+ SyncError ProcessSyncChanges(const base::Location& from_here,
const SyncChangeList& change_list) override;
SyncDataList GetAllSyncData(syncer::ModelType type) const override {
@@ -68,7 +68,7 @@
};
SyncError MockChangeProcessor::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const SyncChangeList& change_list) {
change_list_ = change_list;
return SyncError();
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc
index e16fcd6..8cc09bf 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.cc
@@ -314,7 +314,7 @@
}
syncer::SyncError SupervisedUserSharedSettingsService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
for (const SyncChange& sync_change : change_list) {
SyncData data = sync_change.sync_data();
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h
index 5ccaaab..ccdaa07 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.h
@@ -99,7 +99,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
private:
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
index 2c6b4b1a..02494f2 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
@@ -43,9 +43,8 @@
~MockSyncErrorFactory() override;
// SyncErrorFactory implementation:
- syncer::SyncError CreateAndUploadError(
- const tracked_objects::Location& location,
- const std::string& message) override;
+ syncer::SyncError CreateAndUploadError(const base::Location& location,
+ const std::string& message) override;
private:
syncer::ModelType type_;
@@ -59,7 +58,7 @@
MockSyncErrorFactory::~MockSyncErrorFactory() {}
syncer::SyncError MockSyncErrorFactory::CreateAndUploadError(
- const tracked_objects::Location& location,
+ const base::Location& location,
const std::string& message) {
return syncer::SyncError(location, SyncError::DATATYPE_ERROR, message, type_);
}
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
index 195c6a1..7c07522 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.cc
@@ -486,7 +486,7 @@
}
SyncError SupervisedUserSyncService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const SyncChangeList& change_list) {
SyncError error;
DictionaryPrefUpdate update(prefs_, prefs::kSupervisedUsers);
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
index fe8d81e7..50e59f2 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service.h
@@ -121,7 +121,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
private:
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
index 7053973..d19205b 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
@@ -50,7 +50,7 @@
~MockChangeProcessor() override {}
// SyncChangeProcessor implementation:
- SyncError ProcessSyncChanges(const tracked_objects::Location& from_here,
+ SyncError ProcessSyncChanges(const base::Location& from_here,
const SyncChangeList& change_list) override;
SyncDataList GetAllSyncData(syncer::ModelType type) const override {
@@ -65,7 +65,7 @@
};
SyncError MockChangeProcessor::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const SyncChangeList& change_list) {
change_list_ = change_list;
return SyncError();
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc
index b87c453..ce71d9e 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
@@ -351,7 +351,7 @@
}
SyncError SupervisedUserSettingsService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const SyncChangeList& change_list) {
for (const SyncChange& sync_change : change_list) {
SyncData data = sync_change.sync_data();
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h
index 64912ba..c5ef215 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service.h
+++ b/chrome/browser/supervised_user/supervised_user_settings_service.h
@@ -138,7 +138,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
// PrefStore::Observer implementation:
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
index 39743f1..d2f472c 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
@@ -28,9 +28,8 @@
~MockSyncErrorFactory() override;
// SyncErrorFactory implementation:
- syncer::SyncError CreateAndUploadError(
- const tracked_objects::Location& location,
- const std::string& message) override;
+ syncer::SyncError CreateAndUploadError(const base::Location& location,
+ const std::string& message) override;
private:
syncer::ModelType type_;
@@ -44,7 +43,7 @@
MockSyncErrorFactory::~MockSyncErrorFactory() {}
syncer::SyncError MockSyncErrorFactory::CreateAndUploadError(
- const tracked_objects::Location& location,
+ const base::Location& location,
const std::string& message) {
return syncer::SyncError(location,
syncer::SyncError::DATATYPE_ERROR,
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
index 901fa2ef..2d25280 100644
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
@@ -233,7 +233,7 @@
}
syncer::SyncError SupervisedUserWhitelistService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
bool whitelists_removed = false;
syncer::SyncError error;
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.h b/chrome/browser/supervised_user/supervised_user_whitelist_service.h
index 53268fa..daee28d 100644
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.h
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.h
@@ -85,7 +85,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
private:
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper.h b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
index 16aef64..f608b6e 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_helper.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
@@ -37,7 +37,7 @@
class CallbackHolder {
public:
CallbackHolder(const scoped_refptr<base::SequencedTaskRunner>& task_runner,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Callback<T>& callback)
: task_runner_(task_runner),
from_here_(from_here),
@@ -52,12 +52,12 @@
}
base::SequencedTaskRunner* task_runner() const { return task_runner_.get(); }
- const tracked_objects::Location& from_here() const { return from_here_; }
+ const base::Location& from_here() const { return from_here_; }
const base::Callback<T>& callback() const { return *callback_; }
private:
scoped_refptr<base::SequencedTaskRunner> task_runner_;
- const tracked_objects::Location from_here_;
+ const base::Location from_here_;
std::unique_ptr<base::Callback<T>> callback_;
DISALLOW_COPY_AND_ASSIGN(CallbackHolder);
@@ -80,7 +80,7 @@
template <typename T>
base::Callback<T> RelayCallbackToTaskRunner(
const scoped_refptr<base::SequencedTaskRunner>& task_runner,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Callback<T>& callback) {
DCHECK(task_runner->RunsTasksInCurrentSequence());
@@ -94,7 +94,7 @@
template <typename T>
base::Callback<T> RelayCallbackToCurrentThread(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Callback<T>& callback) {
return RelayCallbackToTaskRunner(
base::ThreadTaskRunnerHandle::Get(),
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 8c39c28..0985d6e 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -1548,7 +1548,7 @@
}
void MetadataDatabase::UpdateByFileMetadata(
- const tracked_objects::Location& from_where,
+ const base::Location& from_where,
std::unique_ptr<FileMetadata> metadata,
UpdateOption option) {
DCHECK(metadata);
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
index 7ec188ea..f893b67 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
@@ -84,11 +84,10 @@
status);
}
-void SyncTaskManager::ScheduleTask(
- const tracked_objects::Location& from_here,
- const Task& task,
- Priority priority,
- const SyncStatusCallback& callback) {
+void SyncTaskManager::ScheduleTask(const base::Location& from_here,
+ const Task& task,
+ Priority priority,
+ const SyncStatusCallback& callback) {
DCHECK(sequence_checker_.CalledOnValidSequence());
ScheduleSyncTask(from_here,
@@ -96,11 +95,10 @@
priority, callback);
}
-void SyncTaskManager::ScheduleSyncTask(
- const tracked_objects::Location& from_here,
- std::unique_ptr<SyncTask> task,
- Priority priority,
- const SyncStatusCallback& callback) {
+void SyncTaskManager::ScheduleSyncTask(const base::Location& from_here,
+ std::unique_ptr<SyncTask> task,
+ Priority priority,
+ const SyncStatusCallback& callback) {
DCHECK(sequence_checker_.CalledOnValidSequence());
std::unique_ptr<SyncTaskToken> token(GetToken(from_here, callback));
@@ -115,10 +113,9 @@
RunTask(std::move(token), std::move(task));
}
-bool SyncTaskManager::ScheduleTaskIfIdle(
- const tracked_objects::Location& from_here,
- const Task& task,
- const SyncStatusCallback& callback) {
+bool SyncTaskManager::ScheduleTaskIfIdle(const base::Location& from_here,
+ const Task& task,
+ const SyncStatusCallback& callback) {
DCHECK(sequence_checker_.CalledOnValidSequence());
return ScheduleSyncTaskIfIdle(
@@ -127,7 +124,7 @@
}
bool SyncTaskManager::ScheduleSyncTaskIfIdle(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
std::unique_ptr<SyncTask> task,
const SyncStatusCallback& callback) {
DCHECK(sequence_checker_.CalledOnValidSequence());
@@ -330,7 +327,7 @@
if (background_task_token) {
background_task_token->set_task_blocker(std::move(task_blocker));
} else {
- tracked_objects::Location from_here = foreground_task_token->location();
+ base::Location from_here = foreground_task_token->location();
SyncStatusCallback callback = foreground_task_token->callback();
foreground_task_token->clear_callback();
@@ -349,7 +346,7 @@
}
std::unique_ptr<SyncTaskToken> SyncTaskManager::GetToken(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const SyncStatusCallback& callback) {
DCHECK(sequence_checker_.CalledOnValidSequence());
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
index 96920f27..d6962457 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
@@ -51,7 +51,7 @@
SyncStatusCallback()));
}
-void SyncTaskToken::UpdateTask(const tracked_objects::Location& location,
+void SyncTaskToken::UpdateTask(const base::Location& location,
const SyncStatusCallback& callback) {
DCHECK(callback_.is_null());
location_ = location;
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
index f18e1d4..86841121 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
@@ -45,10 +45,10 @@
int64_t token_id,
std::unique_ptr<TaskBlocker> task_blocker);
- void UpdateTask(const tracked_objects::Location& location,
+ void UpdateTask(const base::Location& location,
const SyncStatusCallback& callback);
- const tracked_objects::Location& location() const { return location_; }
+ const base::Location& location() const { return location_; }
virtual ~SyncTaskToken();
static SyncStatusCallback WrapToCallback(
@@ -82,7 +82,7 @@
base::WeakPtr<SyncTaskManager> manager_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
- tracked_objects::Location location_;
+ base::Location location_;
int64_t token_id_;
SyncStatusCallback callback_;
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
index 55d88459..b080de3 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -61,7 +61,7 @@
template <typename R, typename CallbackType>
R RunOnThread(base::SingleThreadTaskRunner* task_runner,
- const tracked_objects::Location& location,
+ const base::Location& location,
base::OnceCallback<void(CallbackType callback)> task) {
R result;
base::RunLoop run_loop;
@@ -77,7 +77,7 @@
}
void RunOnThread(base::SingleThreadTaskRunner* task_runner,
- const tracked_objects::Location& location,
+ const base::Location& location,
base::OnceClosure task) {
base::RunLoop run_loop;
task_runner->PostTaskAndReply(
diff --git a/chrome/browser/sync_file_system/local/local_file_change_tracker.cc b/chrome/browser/sync_file_system/local/local_file_change_tracker.cc
index 4bdb42e..738e1e1 100644
--- a/chrome/browser/sync_file_system/local/local_file_change_tracker.cc
+++ b/chrome/browser/sync_file_system/local/local_file_change_tracker.cc
@@ -62,7 +62,7 @@
SyncStatusCode Init(RecoveryOption recovery_option);
SyncStatusCode Repair(const std::string& db_path);
- void HandleError(const tracked_objects::Location& from_here,
+ void HandleError(const base::Location& from_here,
const leveldb::Status& status);
const base::FilePath base_path_;
@@ -538,7 +538,7 @@
// TODO(nhiroki): factor out the common methods into somewhere else.
void LocalFileChangeTracker::TrackerDB::HandleError(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const leveldb::Status& status) {
LOG(ERROR) << "LocalFileChangeTracker::TrackerDB failed at: "
<< from_here.ToString() << " with error: " << status.ToString();
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
index b7486626..508fec65 100644
--- a/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
+++ b/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
@@ -52,7 +52,7 @@
const char kOrigin[] = "http://example.com";
-void DidPrepareForProcessRemoteChange(const tracked_objects::Location& where,
+void DidPrepareForProcessRemoteChange(const base::Location& where,
const base::Closure& oncompleted,
SyncStatusCode expected_status,
const SyncFileMetadata& expected_metadata,
@@ -67,7 +67,7 @@
oncompleted.Run();
}
-void OnSyncCompleted(const tracked_objects::Location& where,
+void OnSyncCompleted(const base::Location& where,
const base::Closure& oncompleted,
SyncStatusCode expected_status,
const FileSystemURL& expected_url,
@@ -79,7 +79,7 @@
oncompleted.Run();
}
-void OnGetFileMetadata(const tracked_objects::Location& where,
+void OnGetFileMetadata(const base::Location& where,
const base::Closure& oncompleted,
SyncStatusCode* status_out,
SyncFileMetadata* metadata_out,
@@ -157,7 +157,7 @@
void PrepareForProcessRemoteChange(
const FileSystemURL& url,
- const tracked_objects::Location& where,
+ const base::Location& where,
SyncStatusCode expected_status,
const SyncFileMetadata& expected_metadata) {
base::RunLoop run_loop;
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
index 9079410e..507e0775 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
+++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
@@ -109,19 +109,19 @@
callback_count_ = 0;
}
- StatusCallback ExpectStatus(const tracked_objects::Location& location,
+ StatusCallback ExpectStatus(const base::Location& location,
File::Error expect) {
return base::Bind(&SyncableFileOperationRunnerTest::DidFinish,
weak_factory_.GetWeakPtr(), location, expect);
}
FileSystemOperation::WriteCallback GetWriteCallback(
- const tracked_objects::Location& location) {
+ const base::Location& location) {
return base::Bind(&SyncableFileOperationRunnerTest::DidWrite,
weak_factory_.GetWeakPtr(), location);
}
- void DidWrite(const tracked_objects::Location& location,
+ void DidWrite(const base::Location& location,
File::Error status,
int64_t bytes,
bool complete) {
@@ -132,8 +132,9 @@
++callback_count_;
}
- void DidFinish(const tracked_objects::Location& location,
- File::Error expect, File::Error status) {
+ void DidFinish(const base::Location& location,
+ File::Error expect,
+ File::Error status) {
SCOPED_TRACE(testing::Message() << location.ToString());
EXPECT_EQ(expect, status);
++callback_count_;
diff --git a/chrome/browser/sync_file_system/logger.cc b/chrome/browser/sync_file_system/logger.cc
index 6d6d980..9eb6111c 100644
--- a/chrome/browser/sync_file_system/logger.cc
+++ b/chrome/browser/sync_file_system/logger.cc
@@ -40,7 +40,7 @@
}
void Log(logging::LogSeverity severity,
- const tracked_objects::Location& location,
+ const base::Location& location,
const char* format,
...) {
std::string what;
diff --git a/chrome/browser/sync_file_system/logger.h b/chrome/browser/sync_file_system/logger.h
index af64661..e3d4520 100644
--- a/chrome/browser/sync_file_system/logger.h
+++ b/chrome/browser/sync_file_system/logger.h
@@ -23,7 +23,7 @@
// Logs a message using printf format.
// This function can be called from any thread.
void Log(logging::LogSeverity level,
- const tracked_objects::Location& location,
+ const base::Location& location,
_Printf_format_string_ const char* format,
...) PRINTF_FORMAT(3, 4);
diff --git a/chrome/browser/sync_file_system/sync_process_runner.cc b/chrome/browser/sync_file_system/sync_process_runner.cc
index 1c0753d6..7fc376f7 100644
--- a/chrome/browser/sync_file_system/sync_process_runner.cc
+++ b/chrome/browser/sync_file_system/sync_process_runner.cc
@@ -31,7 +31,7 @@
bool IsRunning() override { return timer_.IsRunning(); }
- void Start(const tracked_objects::Location& from_here,
+ void Start(const base::Location& from_here,
const base::TimeDelta& delay,
const base::Closure& closure) override {
timer_.Start(from_here, delay, closure);
diff --git a/chrome/browser/sync_file_system/sync_process_runner.h b/chrome/browser/sync_file_system/sync_process_runner.h
index eeb5d19b..1b9b0dc 100644
--- a/chrome/browser/sync_file_system/sync_process_runner.h
+++ b/chrome/browser/sync_file_system/sync_process_runner.h
@@ -59,7 +59,7 @@
public:
virtual ~TimerHelper() {}
virtual bool IsRunning() = 0;
- virtual void Start(const tracked_objects::Location& from_here,
+ virtual void Start(const base::Location& from_here,
const base::TimeDelta& delay,
const base::Closure& closure) = 0;
virtual base::TimeTicks Now() const = 0;
diff --git a/chrome/browser/sync_file_system/sync_process_runner_unittest.cc b/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
index 998db15..55cac1be 100644
--- a/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
+++ b/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
@@ -44,7 +44,7 @@
bool IsRunning() override { return !timer_task_.is_null(); }
- void Start(const tracked_objects::Location& from_here,
+ void Start(const base::Location& from_here,
const base::TimeDelta& delay,
const base::Closure& closure) override {
scheduled_time_ = current_time_ + delay;
diff --git a/chrome/browser/sync_file_system/syncable_file_system_util.cc b/chrome/browser/sync_file_system/syncable_file_system_util.cc
index 25a2e40a..ce2aac2 100644
--- a/chrome/browser/sync_file_system/syncable_file_system_util.cc
+++ b/chrome/browser/sync_file_system/syncable_file_system_util.cc
@@ -109,8 +109,7 @@
return profile_base_dir.Append(kSyncFileSystemDir);
}
-void RunSoon(const tracked_objects::Location& from_here,
- const base::Closure& callback) {
+void RunSoon(const base::Location& from_here, const base::Closure& callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(from_here, callback);
}
diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/themes/theme_syncable_service.cc
index f51a203..97e2af2 100644
--- a/chrome/browser/themes/theme_syncable_service.cc
+++ b/chrome/browser/themes/theme_syncable_service.cc
@@ -129,7 +129,7 @@
}
syncer::SyncError ThemeSyncableService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/chrome/browser/themes/theme_syncable_service.h b/chrome/browser/themes/theme_syncable_service.h
index ea58f10c..59d4d0a 100644
--- a/chrome/browser/themes/theme_syncable_service.h
+++ b/chrome/browser/themes/theme_syncable_service.h
@@ -44,7 +44,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
// Client tag and tile of theme node in sync.
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc
index 01b18af..72f7de7 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -899,7 +899,7 @@
}
syncer::SyncError AppListSyncableService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
if (!sync_processor_.get()) {
return syncer::SyncError(FROM_HERE,
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.h b/chrome/browser/ui/app_list/app_list_syncable_service.h
index dd83921..c95ab4c4 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.h
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.h
@@ -144,7 +144,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
private:
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
index f62a78a6..4e42d819 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service_unittest.cc
@@ -364,7 +364,7 @@
CreateAppRemoteData(kItemId2, "item_name2x", GenerateId("parent_id2x"),
"ordinalx", "pinordinalx")));
- app_list_syncable_service()->ProcessSyncChanges(tracked_objects::Location(),
+ app_list_syncable_service()->ProcessSyncChanges(base::Location(),
change_list);
content::RunAllBlockingPoolTasksUntilIdle();
@@ -407,7 +407,7 @@
}
// Validate items with bad data are processed without crashing.
- app_list_syncable_service()->ProcessSyncChanges(tracked_objects::Location(),
+ app_list_syncable_service()->ProcessSyncChanges(base::Location(),
change_list);
content::RunAllBlockingPoolTasksUntilIdle();
diff --git a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
index 49d979f..90bfa4a 100644
--- a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
+++ b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
@@ -198,7 +198,7 @@
}
syncer::SyncError ArcPackageSyncableService::ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) {
if (!sync_processor_.get()) {
return syncer::SyncError(FROM_HERE, syncer::SyncError::DATATYPE_ERROR,
diff --git a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h
index d3e17365..1821e6e7 100644
--- a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h
+++ b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.h
@@ -63,7 +63,7 @@
void StopSyncing(syncer::ModelType type) override;
syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const syncer::SyncChangeList& change_list) override;
bool SyncStarted();
