Replace tracked_objects::Location with base::Location.
Part 4/4 to replace these namespace qualifications.
[email protected]
Bug: 763556
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I31d6c69d73111165fb1bd8294cd0fe4e18ce96bd
Reviewed-on: https://chromium-review.googlesource.com/662561
Commit-Queue: Brett Wilson <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Brett Wilson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#501199}diff --git a/media/base/fake_single_thread_task_runner.h b/media/base/fake_single_thread_task_runner.h
index b5ad0ed1..a56ac6f 100644
--- a/media/base/fake_single_thread_task_runner.h
+++ b/media/base/fake_single_thread_task_runner.h
@@ -24,14 +24,14 @@
void Sleep(base::TimeDelta t);
// base::SingleThreadTaskRunner implementation.
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) final;
bool RunsTasksInCurrentSequence() const final;
// This function is currently not used, and will return false.
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) final;
diff --git a/media/capture/content/capture_resolution_chooser_unittest.cc b/media/capture/content/capture_resolution_chooser_unittest.cc
index 587a91fc..988756b 100644
--- a/media/capture/content/capture_resolution_chooser_unittest.cc
+++ b/media/capture/content/capture_resolution_chooser_unittest.cc
@@ -11,7 +11,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/size.h"
-using tracked_objects::Location;
+using base::Location;
namespace media {
diff --git a/media/capture/content/screen_capture_device_core.cc b/media/capture/content/screen_capture_device_core.cc
index 4ebcdf1..8fa0601 100644
--- a/media/capture/content/screen_capture_device_core.cc
+++ b/media/capture/content/screen_capture_device_core.cc
@@ -173,7 +173,7 @@
state_ = next_state;
}
-void ScreenCaptureDeviceCore::Error(const tracked_objects::Location& from_here,
+void ScreenCaptureDeviceCore::Error(const base::Location& from_here,
const std::string& reason) {
DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/media/capture/content/thread_safe_capture_oracle.cc b/media/capture/content/thread_safe_capture_oracle.cc
index 72905a2..386186ae 100644
--- a/media/capture/content/thread_safe_capture_oracle.cc
+++ b/media/capture/content/thread_safe_capture_oracle.cc
@@ -219,9 +219,8 @@
client_.reset();
}
-void ThreadSafeCaptureOracle::ReportError(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void ThreadSafeCaptureOracle::ReportError(const base::Location& from_here,
+ const std::string& reason) {
base::AutoLock guard(lock_);
if (client_)
client_->OnError(from_here, reason);
diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc
index a9dcfb8..b98c0bb 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -440,9 +440,8 @@
}
}
-void VideoCaptureDeviceAndroid::SetErrorState(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void VideoCaptureDeviceAndroid::SetErrorState(const base::Location& from_here,
+ const std::string& reason) {
{
base::AutoLock lock(lock_);
state_ = kError;
diff --git a/media/capture/video/chromeos/camera_device_context.cc b/media/capture/video/chromeos/camera_device_context.cc
index bf7b580..36a9bd1 100644
--- a/media/capture/video/chromeos/camera_device_context.cc
+++ b/media/capture/video/chromeos/camera_device_context.cc
@@ -26,9 +26,8 @@
return state_;
}
-void CameraDeviceContext::SetErrorState(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void CameraDeviceContext::SetErrorState(const base::Location& from_here,
+ const std::string& reason) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
state_ = State::kError;
LOG(ERROR) << reason;
diff --git a/media/capture/video/chromeos/camera_device_context.h b/media/capture/video/chromeos/camera_device_context.h
index bb11a46..33f950d 100644
--- a/media/capture/video/chromeos/camera_device_context.h
+++ b/media/capture/video/chromeos/camera_device_context.h
@@ -99,7 +99,7 @@
// Sets state to kError and call |client_->OnError| to tear down the
// VideoCaptureDevice.
- void SetErrorState(const tracked_objects::Location& from_here,
+ void SetErrorState(const base::Location& from_here,
const std::string& reason);
// Logs |message| to |client_|.
diff --git a/media/capture/video/chromeos/mock_video_capture_client.cc b/media/capture/video/chromeos/mock_video_capture_client.cc
index dcda5aa..b9be6f7 100644
--- a/media/capture/video/chromeos/mock_video_capture_client.cc
+++ b/media/capture/video/chromeos/mock_video_capture_client.cc
@@ -32,9 +32,8 @@
quit_cb_ = std::move(quit_cb);
}
-void MockVideoCaptureClient::DumpError(
- const tracked_objects::Location& location,
- const std::string& message) {
+void MockVideoCaptureClient::DumpError(const base::Location& location,
+ const std::string& message) {
DPLOG(ERROR) << location.ToString() << " " << message;
}
diff --git a/media/capture/video/chromeos/mock_video_capture_client.h b/media/capture/video/chromeos/mock_video_capture_client.h
index 4423b28..e9be4a7 100644
--- a/media/capture/video/chromeos/mock_video_capture_client.h
+++ b/media/capture/video/chromeos/mock_video_capture_client.h
@@ -18,7 +18,7 @@
MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
MOCK_METHOD0(DoResurrectLastOutputBuffer, void(void));
MOCK_METHOD2(OnError,
- void(const tracked_objects::Location& from_here,
+ void(const base::Location& from_here,
const std::string& reason));
MOCK_CONST_METHOD0(GetBufferPoolUtilization, double(void));
MOCK_METHOD0(OnStarted, void(void));
@@ -31,8 +31,7 @@
void SetQuitCb(base::OnceClosure quit_cb);
- void DumpError(const tracked_objects::Location& location,
- const std::string& message);
+ void DumpError(const base::Location& location, const std::string& message);
void OnIncomingCapturedData(const uint8_t* data,
int length,
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index 0339d906..dee4cab8 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -102,7 +102,7 @@
class MockClient : public VideoCaptureDevice::Client {
public:
MOCK_METHOD2(OnError,
- void(const tracked_objects::Location& from_here,
+ void(const base::Location& from_here,
const std::string& reason));
MOCK_METHOD0(OnStarted, void(void));
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index f776dfb..4455fdb 100644
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -862,9 +862,8 @@
FROM_HERE, base::Bind(&V4L2CaptureDelegate::DoCapture, GetWeakPtr()));
}
-void V4L2CaptureDelegate::SetErrorState(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void V4L2CaptureDelegate::SetErrorState(const base::Location& from_here,
+ const std::string& reason) {
DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
is_capturing_ = false;
client_->OnError(from_here, reason);
diff --git a/media/capture/video/linux/v4l2_capture_delegate_unittest.cc b/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
index b4b4b139..04f7b9f 100644
--- a/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
@@ -208,7 +208,7 @@
ResurrectLastOutputBuffer,
Buffer(const gfx::Size&, VideoPixelFormat, VideoPixelStorage, int));
MOCK_METHOD2(OnError,
- void(const tracked_objects::Location& from_here,
+ void(const base::Location& from_here,
const std::string& reason));
MOCK_CONST_METHOD0(GetBufferPoolUtilization, double(void));
MOCK_METHOD0(OnStarted, void(void));
diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.mm b/media/capture/video/mac/video_capture_device_decklink_mac.mm
index 6948165f..1fa0be20 100644
--- a/media/capture/video/mac/video_capture_device_decklink_mac.mm
+++ b/media/capture/video/mac/video_capture_device_decklink_mac.mm
@@ -73,7 +73,7 @@
ULONG Release() override;
// Forwarder to VideoCaptureDeviceDeckLinkMac::SendErrorString().
- void SendErrorString(const tracked_objects::Location& from_here,
+ void SendErrorString(const base::Location& from_here,
const std::string& reason);
// Forwarder to VideoCaptureDeviceDeckLinkMac::SendLogString().
@@ -311,9 +311,8 @@
return ret_value;
}
-void DeckLinkCaptureDelegate::SendErrorString(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void DeckLinkCaptureDelegate::SendErrorString(const base::Location& from_here,
+ const std::string& reason) {
base::AutoLock lock(lock_);
if (frame_receiver_)
frame_receiver_->SendErrorString(from_here, reason);
@@ -482,7 +481,7 @@
}
void VideoCaptureDeviceDeckLinkMac::SendErrorString(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const std::string& reason) {
DCHECK(thread_checker_.CalledOnValidThread());
base::AutoLock lock(lock_);
diff --git a/media/capture/video/mac/video_capture_device_mac.mm b/media/capture/video/mac/video_capture_device_mac.mm
index 5589405..bbba181 100644
--- a/media/capture/video/mac/video_capture_device_mac.mm
+++ b/media/capture/video/mac/video_capture_device_mac.mm
@@ -486,9 +486,8 @@
photo_callback_.Reset();
}
-void VideoCaptureDeviceMac::ReceiveError(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void VideoCaptureDeviceMac::ReceiveError(const base::Location& from_here,
+ const std::string& reason) {
task_runner_->PostTask(
FROM_HERE, base::Bind(&VideoCaptureDeviceMac::SetErrorState,
weak_factory_.GetWeakPtr(), from_here, reason));
@@ -524,9 +523,8 @@
return id_vendor + ":" + id_product;
}
-void VideoCaptureDeviceMac::SetErrorState(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void VideoCaptureDeviceMac::SetErrorState(const base::Location& from_here,
+ const std::string& reason) {
DCHECK(task_runner_->BelongsToCurrentThread());
state_ = kError;
client_->OnError(from_here, reason);
diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc
index a8eaee5..212dc56 100644
--- a/media/capture/video/video_capture_device_client.cc
+++ b/media/capture/video/video_capture_device_client.cc
@@ -417,9 +417,8 @@
return MakeBufferStruct(buffer_pool_, buffer_id, new_frame_feedback_id);
}
-void VideoCaptureDeviceClient::OnError(
- const tracked_objects::Location& from_here,
- const std::string& reason) {
+void VideoCaptureDeviceClient::OnError(const base::Location& from_here,
+ const std::string& reason) {
const std::string log_message = base::StringPrintf(
"error@ %s, %s, OS message: %s", from_here.ToString().c_str(),
reason.c_str(),
diff --git a/media/capture/video/video_capture_device_client.h b/media/capture/video/video_capture_device_client.h
index 85c80c48..c863a6ee 100644
--- a/media/capture/video/video_capture_device_client.h
+++ b/media/capture/video/video_capture_device_client.h
@@ -76,7 +76,7 @@
media::VideoPixelFormat format,
media::VideoPixelStorage storage,
int new_frame_feedback_id) override;
- void OnError(const tracked_objects::Location& from_here,
+ void OnError(const base::Location& from_here,
const std::string& reason) override;
void OnLog(const std::string& message) override;
void OnStarted() override;
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
index a4b313f..0c52e83 100644
--- a/media/capture/video/video_capture_device_unittest.cc
+++ b/media/capture/video/video_capture_device_unittest.cc
@@ -97,8 +97,7 @@
closure.Run();
}
-void DumpError(const tracked_objects::Location& location,
- const std::string& message) {
+void DumpError(const base::Location& location, const std::string& message) {
DPLOG(ERROR) << location.ToString() << " " << message;
}
@@ -122,7 +121,7 @@
MOCK_METHOD0(DoOnIncomingCapturedVideoFrame, void(void));
MOCK_METHOD0(DoResurrectLastOutputBuffer, void(void));
MOCK_METHOD2(OnError,
- void(const tracked_objects::Location& from_here,
+ void(const base::Location& from_here,
const std::string& reason));
MOCK_CONST_METHOD0(GetBufferPoolUtilization, double(void));
MOCK_METHOD0(OnStarted, void(void));
diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/media/capture/video/win/video_capture_device_mf_win.cc
index 44907fd..b4a4719 100644
--- a/media/capture/video/win/video_capture_device_mf_win.cc
+++ b/media/capture/video/win/video_capture_device_mf_win.cc
@@ -307,9 +307,8 @@
}
}
-void VideoCaptureDeviceMFWin::OnError(
- const tracked_objects::Location& from_here,
- HRESULT hr) {
+void VideoCaptureDeviceMFWin::OnError(const base::Location& from_here,
+ HRESULT hr) {
if (client_.get()) {
client_->OnError(
from_here,
diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc
index 06ee3ba..f0c76738 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/media/capture/video/win/video_capture_device_win.cc
@@ -900,10 +900,9 @@
}
}
-void VideoCaptureDeviceWin::SetErrorState(
- const tracked_objects::Location& from_here,
- const std::string& reason,
- HRESULT hr) {
+void VideoCaptureDeviceWin::SetErrorState(const base::Location& from_here,
+ const std::string& reason,
+ HRESULT hr) {
DCHECK(thread_checker_.CalledOnValidThread());
DLOG_IF_FAILED_WITH_HRESULT(reason, hr);
state_ = kError;
diff --git a/media/cast/cast_environment.cc b/media/cast/cast_environment.cc
index 2026b2e..6f697f13 100644
--- a/media/cast/cast_environment.cc
+++ b/media/cast/cast_environment.cc
@@ -29,16 +29,15 @@
CastEnvironment::~CastEnvironment() {}
bool CastEnvironment::PostTask(ThreadId identifier,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task) {
return GetTaskRunner(identifier)->PostTask(from_here, task);
}
-bool CastEnvironment::PostDelayedTask(
- ThreadId identifier,
- const tracked_objects::Location& from_here,
- const base::Closure& task,
- base::TimeDelta delay) {
+bool CastEnvironment::PostDelayedTask(ThreadId identifier,
+ const base::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) {
return GetTaskRunner(identifier)->PostDelayedTask(from_here, task, delay);
}
diff --git a/media/cast/cast_environment.h b/media/cast/cast_environment.h
index 11d00a7..604d1fd 100644
--- a/media/cast/cast_environment.h
+++ b/media/cast/cast_environment.h
@@ -43,11 +43,11 @@
// 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.
bool PostTask(ThreadId identifier,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task);
bool PostDelayedTask(ThreadId identifier,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task,
base::TimeDelta delay);
diff --git a/media/cast/test/skewed_single_thread_task_runner.cc b/media/cast/test/skewed_single_thread_task_runner.cc
index 20b830a..b7b6db7 100644
--- a/media/cast/test/skewed_single_thread_task_runner.cc
+++ b/media/cast/test/skewed_single_thread_task_runner.cc
@@ -27,7 +27,7 @@
}
bool SkewedSingleThreadTaskRunner::PostDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return task_runner_->PostDelayedTask(
@@ -40,7 +40,7 @@
}
bool SkewedSingleThreadTaskRunner::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return task_runner_->PostNonNestableDelayedTask(
diff --git a/media/cast/test/skewed_single_thread_task_runner.h b/media/cast/test/skewed_single_thread_task_runner.h
index ce009ff..84eb96a 100644
--- a/media/cast/test/skewed_single_thread_task_runner.h
+++ b/media/cast/test/skewed_single_thread_task_runner.h
@@ -30,14 +30,14 @@
void SetSkew(double skew);
// base::SingleThreadTaskRunner implementation.
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) final;
bool RunsTasksInCurrentSequence() const final;
// This function is currently not used, and will return false.
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) final;
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index b97a0d59..03e7c05 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -227,7 +227,7 @@
// Verifies that |buffer| has a specific |size| and |timestamp|.
// |location| simply indicates where the call to this function was made.
// This makes it easier to track down where test failures occur.
- void OnReadDone(const tracked_objects::Location& location,
+ void OnReadDone(const base::Location& location,
const ReadExpectation& read_expectation,
DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
@@ -251,7 +251,7 @@
}
DemuxerStream::ReadCB NewReadCB(
- const tracked_objects::Location& location,
+ const base::Location& location,
int size,
int64_t timestamp_us,
bool is_key_frame,
@@ -261,7 +261,7 @@
}
DemuxerStream::ReadCB NewReadCBWithCheckedDiscard(
- const tracked_objects::Location& location,
+ const base::Location& location,
int size,
int64_t timestamp_us,
base::TimeDelta discard_front_padding,
diff --git a/media/gpu/avda_codec_allocator_unittest.cc b/media/gpu/avda_codec_allocator_unittest.cc
index 682ba0f..237af58 100644
--- a/media/gpu/avda_codec_allocator_unittest.cc
+++ b/media/gpu/avda_codec_allocator_unittest.cc
@@ -152,7 +152,7 @@
// don't have a specialization for void, and void won't work as written. So,
// be sure to return something.
template <typename ReturnType>
- ReturnType PostAndWait(const tracked_objects::Location& from_here,
+ ReturnType PostAndWait(const base::Location& from_here,
const base::Callback<ReturnType(void)>& cb) {
base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED);
diff --git a/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc b/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
index 9e4fe86..350a16f 100644
--- a/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
+++ b/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
@@ -219,7 +219,7 @@
}
void GpuVideoEncodeAcceleratorHost::PostNotifyError(
- const tracked_objects::Location& location,
+ const base::Location& location,
Error error,
const std::string& message) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
index 3d4f67cd..da4728b5 100644
--- a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
@@ -31,14 +31,14 @@
task_ready_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED) {}
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
NOTREACHED();
return false;
}
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
{
diff --git a/mojo/public/cpp/system/simple_watcher.cc b/mojo/public/cpp/system/simple_watcher.cc
index 3654a0e5..307e288 100644
--- a/mojo/public/cpp/system/simple_watcher.cc
+++ b/mojo/public/cpp/system/simple_watcher.cc
@@ -122,7 +122,7 @@
DISALLOW_COPY_AND_ASSIGN(Context);
};
-SimpleWatcher::SimpleWatcher(const tracked_objects::Location& from_here,
+SimpleWatcher::SimpleWatcher(const base::Location& from_here,
ArmingPolicy arming_policy,
scoped_refptr<base::SequencedTaskRunner> runner)
: arming_policy_(arming_policy),
diff --git a/mojo/public/cpp/system/simple_watcher.h b/mojo/public/cpp/system/simple_watcher.h
index d5caf92..d9f7251 100644
--- a/mojo/public/cpp/system/simple_watcher.h
+++ b/mojo/public/cpp/system/simple_watcher.h
@@ -85,7 +85,7 @@
MANUAL,
};
- SimpleWatcher(const tracked_objects::Location& from_here,
+ SimpleWatcher(const base::Location& from_here,
ArmingPolicy arming_policy,
scoped_refptr<base::SequencedTaskRunner> runner =
base::SequencedTaskRunnerHandle::Get());
diff --git a/net/cert_net/nss_ocsp.cc b/net/cert_net/nss_ocsp.cc
index 7e7239d..da05dea26 100644
--- a/net/cert_net/nss_ocsp.cc
+++ b/net/cert_net/nss_ocsp.cc
@@ -83,7 +83,7 @@
}
// Called from worker thread.
- void PostTaskToIOLoop(const tracked_objects::Location& from_here,
+ void PostTaskToIOLoop(const base::Location& from_here,
const base::Closure& task);
void AddRequest(OCSPRequestSession* request);
@@ -540,8 +540,8 @@
pthread_mutex_unlock(&g_request_context_lock);
}
-void OCSPIOLoop::PostTaskToIOLoop(
- const tracked_objects::Location& from_here, const base::Closure& task) {
+void OCSPIOLoop::PostTaskToIOLoop(const base::Location& from_here,
+ const base::Closure& task) {
base::AutoLock autolock(lock_);
if (io_loop_)
io_loop_->task_runner()->PostTask(from_here, task);
diff --git a/net/disk_cache/blockfile/in_flight_backend_io.cc b/net/disk_cache/blockfile/in_flight_backend_io.cc
index 55afc74..2e7f7c6 100644
--- a/net/disk_cache/blockfile/in_flight_backend_io.cc
+++ b/net/disk_cache/blockfile/in_flight_backend_io.cc
@@ -550,9 +550,8 @@
op->callback().Run(op->result());
}
-void InFlightBackendIO::PostOperation(
- const tracked_objects::Location& from_here,
- BackendIO* operation) {
+void InFlightBackendIO::PostOperation(const base::Location& from_here,
+ BackendIO* operation) {
background_thread_->PostTask(
from_here, base::Bind(&BackendIO::ExecuteOperation, operation));
OnOperationPosted(operation);
diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc
index 1ac3dca9..15e85a00 100644
--- a/net/dns/mdns_client_unittest.cc
+++ b/net/dns/mdns_client_unittest.cc
@@ -377,7 +377,7 @@
MockTimer() : base::MockTimer(false, false) {}
~MockTimer() {}
- void Start(const tracked_objects::Location& posted_from,
+ void Start(const base::Location& posted_from,
base::TimeDelta delay,
const base::Closure& user_task) {
StartObserver(posted_from, delay, user_task);
@@ -387,7 +387,7 @@
// StartObserver is invoked when MockTimer::Start() is called.
// Does not replace the behavior of MockTimer::Start().
MOCK_METHOD3(StartObserver,
- void(const tracked_objects::Location& posted_from,
+ void(const base::Location& posted_from,
base::TimeDelta delay,
const base::Closure& user_task));
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
index be7cf07..637a8cee 100644
--- a/net/extras/sqlite/sqlite_persistent_cookie_store.cc
+++ b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
@@ -232,10 +232,8 @@
void DatabaseErrorCallback(int error, sql::Statement* stmt);
void KillDatabase();
- void PostBackgroundTask(const tracked_objects::Location& origin,
- base::OnceClosure task);
- void PostClientTask(const tracked_objects::Location& origin,
- base::OnceClosure task);
+ void PostBackgroundTask(const base::Location& origin, base::OnceClosure task);
+ void PostClientTask(const base::Location& origin, base::OnceClosure task);
// Shared code between the different load strategies to be used after all
// cookies have been loaded.
@@ -1359,7 +1357,7 @@
}
void SQLitePersistentCookieStore::Backend::PostBackgroundTask(
- const tracked_objects::Location& origin,
+ const base::Location& origin,
base::OnceClosure task) {
if (!background_task_runner_->PostTask(origin, std::move(task))) {
LOG(WARNING) << "Failed to post task from " << origin.ToString()
@@ -1368,7 +1366,7 @@
}
void SQLitePersistentCookieStore::Backend::PostClientTask(
- const tracked_objects::Location& origin,
+ const base::Location& origin,
base::OnceClosure task) {
if (!client_task_runner_->PostTask(origin, std::move(task))) {
LOG(WARNING) << "Failed to post task from " << origin.ToString()
diff --git a/net/http/bidirectional_stream_unittest.cc b/net/http/bidirectional_stream_unittest.cc
index b6dd52c..cbb28ae 100644
--- a/net/http/bidirectional_stream_unittest.cc
+++ b/net/http/bidirectional_stream_unittest.cc
@@ -372,7 +372,7 @@
MockTimer() : base::MockTimer(false, false) {}
~MockTimer() override {}
- void Start(const tracked_objects::Location& posted_from,
+ void Start(const base::Location& posted_from,
base::TimeDelta delay,
const base::Closure& user_task) override {
// Sets a maximum delay, so the timer does not fire unless it is told to.
diff --git a/net/quic/chromium/test_task_runner.cc b/net/quic/chromium/test_task_runner.cc
index a9f9b2e98..e4bf48f 100644
--- a/net/quic/chromium/test_task_runner.cc
+++ b/net/quic/chromium/test_task_runner.cc
@@ -17,7 +17,7 @@
TestTaskRunner::~TestTaskRunner() {}
-bool TestTaskRunner::PostDelayedTask(const tracked_objects::Location& from_here,
+bool TestTaskRunner::PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
EXPECT_GE(delay, base::TimeDelta());
diff --git a/net/quic/chromium/test_task_runner.h b/net/quic/chromium/test_task_runner.h
index 6744ca8..c0c9bce 100644
--- a/net/quic/chromium/test_task_runner.h
+++ b/net/quic/chromium/test_task_runner.h
@@ -27,7 +27,7 @@
explicit TestTaskRunner(MockClock* clock);
// base::TaskRunner implementation.
- 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;
diff --git a/net/ssl/openssl_ssl_util.cc b/net/ssl/openssl_ssl_util.cc
index 6f84a06b..0209955 100644
--- a/net/ssl/openssl_ssl_util.cc
+++ b/net/ssl/openssl_ssl_util.cc
@@ -152,7 +152,7 @@
} // namespace
-void OpenSSLPutNetError(const tracked_objects::Location& location, int err) {
+void OpenSSLPutNetError(const base::Location& location, int err) {
// Net error codes are negative. Encode them as positive numbers.
err = -err;
if (err < 0 || err > 0xfff) {
diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc
index ac78eb9..71bcfa0 100644
--- a/ppapi/proxy/ppb_message_loop_proxy.cc
+++ b/ppapi/proxy/ppb_message_loop_proxy.cc
@@ -187,10 +187,9 @@
static_cast<const void*>(this);
}
-void MessageLoopResource::PostClosure(
- const tracked_objects::Location& from_here,
- const base::Closure& closure,
- int64_t delay_ms) {
+void MessageLoopResource::PostClosure(const base::Location& from_here,
+ const base::Closure& closure,
+ int64_t delay_ms) {
if (task_runner_.get()) {
task_runner_->PostDelayedTask(from_here, closure,
base::TimeDelta::FromMilliseconds(delay_ms));
diff --git a/ppapi/proxy/ppb_message_loop_proxy.h b/ppapi/proxy/ppb_message_loop_proxy.h
index 9c15539..c6df84c 100644
--- a/ppapi/proxy/ppb_message_loop_proxy.h
+++ b/ppapi/proxy/ppb_message_loop_proxy.h
@@ -58,7 +58,7 @@
private:
struct TaskInfo {
- tracked_objects::Location from_here;
+ base::Location from_here;
base::Closure closure;
int64_t delay_ms;
};
@@ -73,7 +73,7 @@
// NOTE: The given closure will be run *WITHOUT* acquiring the Proxy lock.
// This only makes sense for user code and completely thread-safe
// proxy operations (e.g., MessageLoop::QuitClosure).
- void PostClosure(const tracked_objects::Location& from_here,
+ void PostClosure(const base::Location& from_here,
const base::Closure& closure,
int64_t delay_ms) override;
base::SingleThreadTaskRunner* GetTaskRunner() override;
diff --git a/remoting/base/auto_thread_task_runner.cc b/remoting/base/auto_thread_task_runner.cc
index 59e549d..5345f2c 100644
--- a/remoting/base/auto_thread_task_runner.cc
+++ b/remoting/base/auto_thread_task_runner.cc
@@ -17,16 +17,15 @@
DCHECK(!stop_task_.is_null());
}
-bool AutoThreadTaskRunner::PostDelayedTask(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- base::TimeDelta delay) {
+bool AutoThreadTaskRunner::PostDelayedTask(const base::Location& from_here,
+ base::OnceClosure task,
+ base::TimeDelta delay) {
CHECK(task_runner_->PostDelayedTask(from_here, std::move(task), delay));
return true;
}
bool AutoThreadTaskRunner::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
CHECK(task_runner_->PostNonNestableDelayedTask(from_here, std::move(task),
diff --git a/remoting/base/auto_thread_task_runner.h b/remoting/base/auto_thread_task_runner.h
index 4908607..c4f1398 100644
--- a/remoting/base/auto_thread_task_runner.h
+++ b/remoting/base/auto_thread_task_runner.h
@@ -26,10 +26,10 @@
base::OnceClosure stop_task);
// SingleThreadTaskRunner implementation
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
diff --git a/remoting/client/plugin/pepper_main_thread_task_runner.cc b/remoting/client/plugin/pepper_main_thread_task_runner.cc
index d6b51efc..634dfab9 100644
--- a/remoting/client/plugin/pepper_main_thread_task_runner.cc
+++ b/remoting/client/plugin/pepper_main_thread_task_runner.cc
@@ -31,7 +31,7 @@
}
bool PepperMainThreadTaskRunner::PostDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
auto task_ptr = base::MakeUnique<base::OnceClosure>(base::Bind(
@@ -43,7 +43,7 @@
}
bool PepperMainThreadTaskRunner::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return PostDelayedTask(from_here, std::move(task), delay);
diff --git a/remoting/client/plugin/pepper_main_thread_task_runner.h b/remoting/client/plugin/pepper_main_thread_task_runner.h
index 83e02fe..fd79ee1 100644
--- a/remoting/client/plugin/pepper_main_thread_task_runner.h
+++ b/remoting/client/plugin/pepper_main_thread_task_runner.h
@@ -26,10 +26,10 @@
PepperMainThreadTaskRunner();
// base::SingleThreadTaskRunner interface.
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
diff --git a/remoting/client/ui/desktop_viewport_unittest.cc b/remoting/client/ui/desktop_viewport_unittest.cc
index bb4e7623..3694e58 100644
--- a/remoting/client/ui/desktop_viewport_unittest.cc
+++ b/remoting/client/ui/desktop_viewport_unittest.cc
@@ -23,7 +23,7 @@
void TearDown() override;
protected:
- void AssertTransformationReceived(const tracked_objects::Location& from_here,
+ void AssertTransformationReceived(const base::Location& from_here,
float scale,
float offset_x,
float offset_y);
@@ -50,7 +50,7 @@
}
void DesktopViewportTest::AssertTransformationReceived(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
float scale,
float offset_x,
float offset_y) {
diff --git a/remoting/host/backoff_timer.cc b/remoting/host/backoff_timer.cc
index 1df5559..f73cfa1a 100644
--- a/remoting/host/backoff_timer.cc
+++ b/remoting/host/backoff_timer.cc
@@ -12,7 +12,7 @@
BackoffTimer::~BackoffTimer() {}
-void BackoffTimer::Start(const tracked_objects::Location& posted_from,
+void BackoffTimer::Start(const base::Location& posted_from,
base::TimeDelta delay,
base::TimeDelta max_delay,
const base::Closure& user_task) {
diff --git a/remoting/host/backoff_timer.h b/remoting/host/backoff_timer.h
index 5f4ab36e..73b74e9 100644
--- a/remoting/host/backoff_timer.h
+++ b/remoting/host/backoff_timer.h
@@ -23,7 +23,7 @@
// Invokes |user_task| at intervals specified by |delay|, and
// increasing up to |max_delay|. Always invokes |user_task| before
// the first scheduled delay.
- void Start(const tracked_objects::Location& posted_from,
+ void Start(const base::Location& posted_from,
base::TimeDelta delay,
base::TimeDelta max_delay,
const base::Closure& user_task);
@@ -42,7 +42,7 @@
std::unique_ptr<base::Timer> timer_;
base::Closure user_task_;
- tracked_objects::Location posted_from_;
+ base::Location posted_from_;
net::BackoffEntry::Policy backoff_policy_ = {};
std::unique_ptr<net::BackoffEntry> backoff_entry_;
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc
index 40b5c72..9013a18 100644
--- a/remoting/host/daemon_process.cc
+++ b/remoting/host/daemon_process.cc
@@ -252,8 +252,7 @@
(*i)->SetScreenResolution(resolution);
}
-void DaemonProcess::CrashNetworkProcess(
- const tracked_objects::Location& location) {
+void DaemonProcess::CrashNetworkProcess(const base::Location& location) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
DoCrashNetworkProcess(location);
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc
index afa18c8..b8aa0c9 100644
--- a/remoting/host/daemon_process_unittest.cc
+++ b/remoting/host/daemon_process_unittest.cc
@@ -80,7 +80,7 @@
bool(int, int, const IPC::ChannelHandle&));
MOCK_METHOD1(DoCreateDesktopSessionPtr, DesktopSession*(int));
- MOCK_METHOD1(DoCrashNetworkProcess, void(const tracked_objects::Location&));
+ MOCK_METHOD1(DoCrashNetworkProcess, void(const base::Location&));
MOCK_METHOD0(LaunchNetworkProcess, void());
private:
@@ -137,7 +137,7 @@
// DaemonProcess mocks
DesktopSession* DoCreateDesktopSession(int terminal_id);
- void DoCrashNetworkProcess(const tracked_objects::Location& location);
+ void DoCrashNetworkProcess(const base::Location& location);
void LaunchNetworkProcess();
// Deletes |daemon_process_|.
@@ -196,8 +196,7 @@
return new FakeDesktopSession(daemon_process_.get(), terminal_id);
}
-void DaemonProcessTest::DoCrashNetworkProcess(
- const tracked_objects::Location& location) {
+void DaemonProcessTest::DoCrashNetworkProcess(const base::Location& location) {
daemon_process_->SendToNetwork(
new ChromotingDaemonMsg_Crash(location.function_name(),
location.file_name(),
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index 173f364a..7c6ac10 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -95,8 +95,7 @@
int terminal_id,
const ScreenResolution& resolution,
bool virtual_terminal) override;
- void DoCrashNetworkProcess(
- const tracked_objects::Location& location) override;
+ void DoCrashNetworkProcess(const base::Location& location) override;
void LaunchNetworkProcess() override;
// Changes the service start type to 'manual'.
@@ -201,8 +200,7 @@
}
}
-void DaemonProcessWin::DoCrashNetworkProcess(
- const tracked_objects::Location& location) {
+void DaemonProcessWin::DoCrashNetworkProcess(const base::Location& location) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
network_launcher_->Crash(location);
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index 1d7a167..13c560b 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -279,7 +279,7 @@
}
void DesktopProcessTest::SendCrashRequest() {
- tracked_objects::Location location = FROM_HERE;
+ base::Location location = FROM_HERE;
daemon_channel_->Send(new ChromotingDaemonMsg_Crash(
location.function_name(), location.file_name(), location.line_number()));
}
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index 321f69b..e18d074 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -679,8 +679,7 @@
}
}
-void DesktopSessionWin::CrashDesktopProcess(
- const tracked_objects::Location& location) {
+void DesktopSessionWin::CrashDesktopProcess(const base::Location& location) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
launcher_->Crash(location);
diff --git a/remoting/host/win/worker_process_launcher.cc b/remoting/host/win/worker_process_launcher.cc
index 99af9a4..39f68a3 100644
--- a/remoting/host/win/worker_process_launcher.cc
+++ b/remoting/host/win/worker_process_launcher.cc
@@ -73,8 +73,7 @@
StopWorker();
}
-void WorkerProcessLauncher::Crash(
- const tracked_objects::Location& location) {
+void WorkerProcessLauncher::Crash(const base::Location& location) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
// Ask the worker process to crash voluntarily if it is still connected.
diff --git a/remoting/protocol/pairing_registry.cc b/remoting/protocol/pairing_registry.cc
index 1e763a4..8193745c 100644
--- a/remoting/protocol/pairing_registry.cc
+++ b/remoting/protocol/pairing_registry.cc
@@ -177,7 +177,7 @@
void PairingRegistry::PostTask(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task) {
task_runner->PostTask(from_here, task);
}
diff --git a/remoting/protocol/protocol_mock_objects.cc b/remoting/protocol/protocol_mock_objects.cc
index 10ffb35..ddd273e 100644
--- a/remoting/protocol/protocol_mock_objects.cc
+++ b/remoting/protocol/protocol_mock_objects.cc
@@ -92,7 +92,7 @@
void SynchronousPairingRegistry::PostTask(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task) {
DCHECK(task_runner->BelongsToCurrentThread());
task.Run();
diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h
index 936d94f..ffea02d 100644
--- a/remoting/protocol/protocol_mock_objects.h
+++ b/remoting/protocol/protocol_mock_objects.h
@@ -261,7 +261,7 @@
// Runs tasks synchronously instead of posting them to |task_runner|.
void PostTask(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::Closure& task) override;
};
diff --git a/storage/browser/fileapi/sandbox_directory_database.cc b/storage/browser/fileapi/sandbox_directory_database.cc
index 4afe5e2..7b73e14 100644
--- a/storage/browser/fileapi/sandbox_directory_database.cc
+++ b/storage/browser/fileapi/sandbox_directory_database.cc
@@ -948,9 +948,8 @@
return true;
}
-void SandboxDirectoryDatabase::HandleError(
- const tracked_objects::Location& from_here,
- const leveldb::Status& status) {
+void SandboxDirectoryDatabase::HandleError(const base::Location& from_here,
+ const leveldb::Status& status) {
LOG(ERROR) << "SandboxDirectoryDatabase failed at: "
<< from_here.ToString() << " with error: " << status.ToString();
db_.reset();
diff --git a/storage/browser/fileapi/sandbox_origin_database.cc b/storage/browser/fileapi/sandbox_origin_database.cc
index 5735eda..07a8b43 100644
--- a/storage/browser/fileapi/sandbox_origin_database.cc
+++ b/storage/browser/fileapi/sandbox_origin_database.cc
@@ -189,9 +189,8 @@
return true;
}
-void SandboxOriginDatabase::HandleError(
- const tracked_objects::Location& from_here,
- const leveldb::Status& status) {
+void SandboxOriginDatabase::HandleError(const base::Location& from_here,
+ const leveldb::Status& status) {
db_.reset();
LOG(ERROR) << "SandboxOriginDatabase failed at: "
<< from_here.ToString() << " with error: " << status.ToString();
diff --git a/storage/browser/fileapi/timed_task_helper.cc b/storage/browser/fileapi/timed_task_helper.cc
index 0ea3f09..eb3d1b12 100644
--- a/storage/browser/fileapi/timed_task_helper.cc
+++ b/storage/browser/fileapi/timed_task_helper.cc
@@ -40,10 +40,9 @@
return tracker_ != NULL;
}
-void TimedTaskHelper::Start(
- const tracked_objects::Location& posted_from,
- base::TimeDelta delay,
- const base::Closure& user_task) {
+void TimedTaskHelper::Start(const base::Location& posted_from,
+ base::TimeDelta delay,
+ const base::Closure& user_task) {
posted_from_ = posted_from;
delay_ = delay;
user_task_ = user_task;
diff --git a/storage/browser/fileapi/timed_task_helper.h b/storage/browser/fileapi/timed_task_helper.h
index 09a6137f..d098609 100644
--- a/storage/browser/fileapi/timed_task_helper.h
+++ b/storage/browser/fileapi/timed_task_helper.h
@@ -30,7 +30,7 @@
~TimedTaskHelper();
bool IsRunning() const;
- void Start(const tracked_objects::Location& posted_from,
+ void Start(const base::Location& posted_from,
base::TimeDelta delay,
const base::Closure& user_task);
void Reset();
@@ -43,7 +43,7 @@
void PostDelayedTask(std::unique_ptr<Tracker> tracker, base::TimeDelta delay);
scoped_refptr<base::SequencedTaskRunner> task_runner_;
- tracked_objects::Location posted_from_;
+ base::Location posted_from_;
base::TimeDelta delay_;
base::Closure user_task_;
diff --git a/storage/browser/quota/quota_manager.cc b/storage/browser/quota/quota_manager.cc
index 64f0150..8e57fc5 100644
--- a/storage/browser/quota/quota_manager.cc
+++ b/storage/browser/quota/quota_manager.cc
@@ -1676,7 +1676,7 @@
}
void QuotaManager::PostTaskAndReplyWithResultForDBThread(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::Callback<bool(QuotaDatabase*)> task,
base::Callback<void(bool)> reply) {
// Deleting manager will post another task to DB sequence to delete
diff --git a/storage/browser/quota/quota_manager.h b/storage/browser/quota/quota_manager.h
index 5973b5b..48edac76 100644
--- a/storage/browser/quota/quota_manager.h
+++ b/storage/browser/quota/quota_manager.h
@@ -415,7 +415,7 @@
void DeleteOnCorrectThread() const;
void PostTaskAndReplyWithResultForDBThread(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::Callback<bool(QuotaDatabase*)> task,
base::Callback<void(bool)> reply);
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue.cc
index ee15399..f2d6a30 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue.cc
@@ -14,7 +14,7 @@
TaskQueue::~TaskQueue() {}
-TaskQueue::Task::Task(const tracked_objects::Location& posted_from,
+TaskQueue::Task::Task(const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
bool nestable)
@@ -28,16 +28,15 @@
return impl_->RunsTasksInCurrentSequence();
}
-bool TaskQueue::PostDelayedTask(const tracked_objects::Location& from_here,
+bool TaskQueue::PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return impl_->PostDelayedTask(from_here, std::move(task), delay);
}
-bool TaskQueue::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- base::TimeDelta delay) {
+bool TaskQueue::PostNonNestableDelayedTask(const base::Location& from_here,
+ base::OnceClosure task,
+ base::TimeDelta delay) {
return impl_->PostNonNestableDelayedTask(from_here, std::move(task), delay);
}
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue.h b/third_party/WebKit/Source/platform/scheduler/base/task_queue.h
index 6dfcf8c5..3613a9aa 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue.h
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue.h
@@ -118,7 +118,7 @@
// Interface to pass per-task metadata to RendererScheduler.
class PLATFORM_EXPORT Task : public base::PendingTask {
public:
- Task(const tracked_objects::Location& posted_from,
+ Task(const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
bool nestable);
@@ -220,10 +220,10 @@
// base::SingleThreadTaskRunner implementation
bool RunsTasksInCurrentSequence() const override;
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
index f657d1cf..9ad2512 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.cc
@@ -68,7 +68,7 @@
}
TaskQueueImpl::Task::Task()
- : TaskQueue::Task(tracked_objects::Location(),
+ : TaskQueue::Task(base::Location(),
base::Closure(),
base::TimeTicks(),
true),
@@ -79,7 +79,7 @@
sequence_num = 0;
}
-TaskQueueImpl::Task::Task(const tracked_objects::Location& posted_from,
+TaskQueueImpl::Task::Task(const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
EnqueueOrder sequence_number,
@@ -92,7 +92,7 @@
sequence_num = sequence_number;
}
-TaskQueueImpl::Task::Task(const tracked_objects::Location& posted_from,
+TaskQueueImpl::Task::Task(const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
EnqueueOrder sequence_number,
@@ -164,7 +164,7 @@
return base::PlatformThread::CurrentId() == thread_id_;
}
-bool TaskQueueImpl::PostDelayedTask(const tracked_objects::Location& from_here,
+bool TaskQueueImpl::PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
if (delay.is_zero())
@@ -174,10 +174,9 @@
TaskType::NORMAL);
}
-bool TaskQueueImpl::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- base::TimeDelta delay) {
+bool TaskQueueImpl::PostNonNestableDelayedTask(const base::Location& from_here,
+ base::OnceClosure task,
+ base::TimeDelta delay) {
if (delay.is_zero())
return PostImmediateTaskImpl(from_here, std::move(task),
TaskType::NON_NESTABLE);
@@ -186,10 +185,9 @@
TaskType::NON_NESTABLE);
}
-bool TaskQueueImpl::PostImmediateTaskImpl(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- TaskType task_type) {
+bool TaskQueueImpl::PostImmediateTaskImpl(const base::Location& from_here,
+ base::OnceClosure task,
+ TaskType task_type) {
// Use CHECK instead of DCHECK to crash earlier. See http://crbug.com/711167
// for details.
CHECK(task);
@@ -206,11 +204,10 @@
return true;
}
-bool TaskQueueImpl::PostDelayedTaskImpl(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- base::TimeDelta delay,
- TaskType task_type) {
+bool TaskQueueImpl::PostDelayedTaskImpl(const base::Location& from_here,
+ base::OnceClosure task,
+ base::TimeDelta delay,
+ TaskType task_type) {
// Use CHECK instead of DCHECK to crash earlier. See http://crbug.com/711167
// for details.
CHECK(task);
@@ -304,7 +301,7 @@
}
void TaskQueueImpl::PushOntoImmediateIncomingQueueLocked(
- const tracked_objects::Location& posted_from,
+ const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
EnqueueOrder sequence_number,
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.h b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.h
index cdb81fe3..0bf4356 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.h
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.h
@@ -86,13 +86,13 @@
class PLATFORM_EXPORT Task : public TaskQueue::Task {
public:
Task();
- Task(const tracked_objects::Location& posted_from,
+ Task(const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
EnqueueOrder sequence_number,
bool nestable);
- Task(const tracked_objects::Location& posted_from,
+ Task(const base::Location& posted_from,
base::OnceClosure task,
base::TimeTicks desired_run_time,
EnqueueOrder sequence_number,
@@ -143,10 +143,10 @@
// TaskQueue implementation.
const char* GetName() const;
bool RunsTasksInCurrentSequence() const;
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay);
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay);
// Require a reference to enclosing task queue for lifetime control.
@@ -329,10 +329,10 @@
bool is_enabled_for_test;
};
- bool PostImmediateTaskImpl(const tracked_objects::Location& from_here,
+ bool PostImmediateTaskImpl(const base::Location& from_here,
base::OnceClosure task,
TaskType task_type);
- bool PostDelayedTaskImpl(const tracked_objects::Location& from_here,
+ bool PostDelayedTaskImpl(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay,
TaskType task_type);
@@ -353,12 +353,11 @@
// Push the task onto the |immediate_incoming_queue| and for auto pumped
// queues it calls MaybePostDoWorkOnMainRunner if the Incoming queue was
// empty.
- void PushOntoImmediateIncomingQueueLocked(
- const tracked_objects::Location& posted_from,
- base::OnceClosure task,
- base::TimeTicks desired_run_time,
- EnqueueOrder sequence_number,
- bool nestable);
+ void PushOntoImmediateIncomingQueueLocked(const base::Location& posted_from,
+ base::OnceClosure task,
+ base::TimeTicks desired_run_time,
+ EnqueueOrder sequence_number,
+ bool nestable);
// We reserve an inline capacity of 8 tasks to try and reduce the load on
// PartitionAlloc.
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
index e968433..7e3e6c5 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc
@@ -184,13 +184,13 @@
}
void TaskQueueManager::MaybeScheduleImmediateWork(
- const tracked_objects::Location& from_here) {
+ const base::Location& from_here) {
MoveableAutoLock lock(any_thread_lock_);
MaybeScheduleImmediateWorkLocked(from_here, std::move(lock));
}
void TaskQueueManager::MaybeScheduleImmediateWorkLocked(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
MoveableAutoLock lock) {
{
MoveableAutoLock auto_lock(std::move(lock));
@@ -210,7 +210,7 @@
}
void TaskQueueManager::MaybeScheduleDelayedWork(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
TimeDomain* requesting_time_domain,
base::TimeTicks now,
base::TimeTicks run_time) {
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.h b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.h
index d1e856b..d12e024 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.h
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.h
@@ -67,12 +67,12 @@
// These tasks are de-duplicated in two buckets: main-thread and all other
// threads. This distinction is done to reduce the overehead from locks, we
// assume the main-thread path will be hot.
- void MaybeScheduleImmediateWork(const tracked_objects::Location& from_here);
+ void MaybeScheduleImmediateWork(const base::Location& from_here);
// Requests that a delayed task to process work is posted on the main task
// runner. These delayed tasks are de-duplicated. Must be called on the thread
// this class was created on.
- void MaybeScheduleDelayedWork(const tracked_objects::Location& from_here,
+ void MaybeScheduleDelayedWork(const base::Location& from_here,
TimeDomain* requesting_time_domain,
base::TimeTicks now,
base::TimeTicks run_time);
@@ -272,7 +272,7 @@
base::TimeTicks* time_after_task);
bool RunsTasksInCurrentSequence() const;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
const base::Closure& task,
base::TimeDelta delay);
@@ -287,9 +287,8 @@
AsValueWithSelectorResult(bool should_run,
internal::WorkQueue* selected_work_queue) const;
- void MaybeScheduleImmediateWorkLocked(
- const tracked_objects::Location& from_here,
- MoveableAutoLock lock);
+ void MaybeScheduleImmediateWorkLocked(const base::Location& from_here,
+ MoveableAutoLock lock);
// Adds |queue| to |any_thread().has_incoming_immediate_work_| and if
// |queue_is_blocked| is false it makes sure a DoWork is posted.
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.cc
index 9c79128..d18a48d 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.cc
@@ -29,14 +29,14 @@
TaskQueueManagerDelegateForTest::~TaskQueueManagerDelegateForTest() {}
bool TaskQueueManagerDelegateForTest::PostDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return task_runner_->PostDelayedTask(from_here, std::move(task), delay);
}
bool TaskQueueManagerDelegateForTest::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return task_runner_->PostNonNestableDelayedTask(from_here, std::move(task),
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.h b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.h
index 4336690b..a6401a8 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.h
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_delegate_for_test.h
@@ -23,10 +23,10 @@
std::unique_ptr<base::TickClock> time_source);
// SingleThreadTaskRunner:
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
index a77fe1a..feb3c04 100644
--- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager_unittest.cc
@@ -168,8 +168,7 @@
return manager_->GetNextSequenceNumber();
}
- void MaybeScheduleImmediateWorkLocked(
- const tracked_objects::Location& from_here) {
+ void MaybeScheduleImmediateWorkLocked(const base::Location& from_here) {
MoveableAutoLock lock(manager_->any_thread_lock_);
manager_->MaybeScheduleImmediateWorkLocked(from_here, std::move(lock));
}
diff --git a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.cc b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.cc
index b84271e..d9e66e2a 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.cc
@@ -40,14 +40,14 @@
}
bool SchedulerTqmDelegateForTest::PostDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return task_runner_->PostDelayedTask(from_here, std::move(task), delay);
}
bool SchedulerTqmDelegateForTest::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return task_runner_->PostNonNestableDelayedTask(from_here, std::move(task),
diff --git a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.h b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.h
index 8323c5b21..afb08c6d 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.h
+++ b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_for_test.h
@@ -28,10 +28,10 @@
void SetDefaultTaskRunner(
scoped_refptr<base::SingleThreadTaskRunner> task_runner) override;
void RestoreDefaultTaskRunner() override;
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
diff --git a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.cc b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.cc
index 4f491b4..448d24b 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.cc
@@ -40,16 +40,15 @@
message_loop_->SetTaskRunner(message_loop_task_runner_);
}
-bool SchedulerTqmDelegateImpl::PostDelayedTask(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- base::TimeDelta delay) {
+bool SchedulerTqmDelegateImpl::PostDelayedTask(const base::Location& from_here,
+ base::OnceClosure task,
+ base::TimeDelta delay) {
return message_loop_task_runner_->PostDelayedTask(from_here, std::move(task),
delay);
}
bool SchedulerTqmDelegateImpl::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
return message_loop_task_runner_->PostNonNestableDelayedTask(
diff --git a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.h b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.h
index 35bc285..881b201 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.h
+++ b/third_party/WebKit/Source/platform/scheduler/child/scheduler_tqm_delegate_impl.h
@@ -28,10 +28,10 @@
void SetDefaultTaskRunner(
scoped_refptr<base::SingleThreadTaskRunner> task_runner) override;
void RestoreDefaultTaskRunner() override;
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
diff --git a/third_party/WebKit/Source/platform/scheduler/child/single_thread_idle_task_runner.cc b/third_party/WebKit/Source/platform/scheduler/child/single_thread_idle_task_runner.cc
index 643e10e..9a63a56 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/single_thread_idle_task_runner.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/single_thread_idle_task_runner.cc
@@ -34,9 +34,8 @@
return idle_priority_task_runner_->RunsTasksInCurrentSequence();
}
-void SingleThreadIdleTaskRunner::PostIdleTask(
- const tracked_objects::Location& from_here,
- const IdleTask& idle_task) {
+void SingleThreadIdleTaskRunner::PostIdleTask(const base::Location& from_here,
+ const IdleTask& idle_task) {
delegate_->OnIdleTaskPosted();
idle_priority_task_runner_->PostTask(
from_here, base::Bind(&SingleThreadIdleTaskRunner::RunTask,
@@ -44,7 +43,7 @@
}
void SingleThreadIdleTaskRunner::PostDelayedIdleTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const base::TimeDelta delay,
const IdleTask& idle_task) {
base::TimeTicks first_run_time = delegate_->NowTicks() + delay;
@@ -55,7 +54,7 @@
}
void SingleThreadIdleTaskRunner::PostNonNestableIdleTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
const IdleTask& idle_task) {
delegate_->OnIdleTaskPosted();
idle_priority_task_runner_->PostNonNestableTask(
diff --git a/third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc b/third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc
index 877bc196..dc80369 100644
--- a/third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc
@@ -81,7 +81,7 @@
thread_->Init();
}
- void RunOnWorkerThread(const tracked_objects::Location& from_here,
+ void RunOnWorkerThread(const base::Location& from_here,
const base::Closure& task) {
base::WaitableEvent completion(
base::WaitableEvent::ResetPolicy::AUTOMATIC,
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.cc b/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.cc
index a808506..cba5c22 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.cc
@@ -19,7 +19,7 @@
DeadlineTaskRunner::~DeadlineTaskRunner() {}
-void DeadlineTaskRunner::SetDeadline(const tracked_objects::Location& from_here,
+void DeadlineTaskRunner::SetDeadline(const base::Location& from_here,
base::TimeDelta delay,
base::TimeTicks now) {
DCHECK(delay > base::TimeDelta());
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.h b/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.h
index 8d61cf2a..6a3d8445 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.h
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/deadline_task_runner.h
@@ -31,7 +31,7 @@
// posted to run after |delay|.
//
// Once the deadline task has run, we reset.
- void SetDeadline(const tracked_objects::Location& from_here,
+ void SetDeadline(const base::Location& from_here,
base::TimeDelta delay,
base::TimeTicks now);
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
index 6a4ce63f..8051aaf 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.cc
@@ -892,7 +892,7 @@
}
void RendererSchedulerImpl::EnsureUrgentPolicyUpdatePostedOnMainThread(
- const tracked_objects::Location& from_here) {
+ const base::Location& from_here) {
// TODO(scheduler-dev): Check that this method isn't called from the main
// thread.
any_thread_lock_.AssertAcquired();
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
index 65436d230..1f67b7e60 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl.h
@@ -442,7 +442,7 @@
// sets |policy_may_need_update_|. Note |any_thread_lock_| must be
// locked.
void EnsureUrgentPolicyUpdatePostedOnMainThread(
- const tracked_objects::Location& from_here);
+ const base::Location& from_here);
// Update the policy if a new signal has arrived. Must be called from the main
// thread.
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
index dab7680d..680b990 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
@@ -245,7 +245,7 @@
}
void TaskQueueThrottler::MaybeSchedulePumpThrottledTasks(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::TimeTicks now,
base::TimeTicks unaligned_runtime) {
if (!allow_throttling_)
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.h b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.h
index 503957ee..9bf450d 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.h
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.h
@@ -166,10 +166,9 @@
// Note |unthrottled_runtime| might be in the past. When this happens we
// compute the delay to the next runtime based on now rather than
// unthrottled_runtime.
- void MaybeSchedulePumpThrottledTasks(
- const tracked_objects::Location& from_here,
- base::TimeTicks now,
- base::TimeTicks runtime);
+ void MaybeSchedulePumpThrottledTasks(const base::Location& from_here,
+ base::TimeTicks now,
+ base::TimeTicks runtime);
// Return next possible time when queue is allowed to run in accordance
// with throttling policy.
diff --git a/third_party/WebKit/Source/platform/scheduler/test/fake_web_task_runner.cc b/third_party/WebKit/Source/platform/scheduler/test/fake_web_task_runner.cc
index 663af1a..a39e5a0 100644
--- a/third_party/WebKit/Source/platform/scheduler/test/fake_web_task_runner.cc
+++ b/third_party/WebKit/Source/platform/scheduler/test/fake_web_task_runner.cc
@@ -47,14 +47,14 @@
public:
explicit BaseTaskRunner(PassRefPtr<Data> data) : data_(std::move(data)) {}
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
data_->PostTask(std::move(task), delay);
return true;
}
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override {
data_->PostTask(std::move(task), delay);
diff --git a/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc b/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc
index 45799646bc..cb46f65 100644
--- a/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc
+++ b/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.cc
@@ -68,7 +68,7 @@
}
bool LazySchedulerMessageLoopDelegateForTests::PostDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
EnsureMessageLoop();
@@ -77,7 +77,7 @@
}
bool LazySchedulerMessageLoopDelegateForTests::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
EnsureMessageLoop();
diff --git a/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h b/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h
index 455e8b1..3fe6ad5 100644
--- a/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h
+++ b/third_party/WebKit/Source/platform/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h
@@ -36,10 +36,10 @@
void SetDefaultTaskRunner(
scoped_refptr<base::SingleThreadTaskRunner> task_runner) override;
void RestoreDefaultTaskRunner() override;
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
bool RunsTasksInCurrentSequence() const override;
diff --git a/third_party/WebKit/public/platform/WebTraceLocation.h b/third_party/WebKit/public/platform/WebTraceLocation.h
index 1dae87e..23ec5513 100644
--- a/third_party/WebKit/public/platform/WebTraceLocation.h
+++ b/third_party/WebKit/public/platform/WebTraceLocation.h
@@ -9,7 +9,7 @@
namespace blink {
-using WebTraceLocation = tracked_objects::Location;
+using WebTraceLocation = base::Location;
#define BLINK_FROM_HERE FROM_HERE
}
diff --git a/third_party/WebKit/public/platform/scheduler/child/single_thread_idle_task_runner.h b/third_party/WebKit/public/platform/scheduler/child/single_thread_idle_task_runner.h
index 032e40a..f78c237 100644
--- a/third_party/WebKit/public/platform/scheduler/child/single_thread_idle_task_runner.h
+++ b/third_party/WebKit/public/platform/scheduler/child/single_thread_idle_task_runner.h
@@ -66,19 +66,18 @@
scoped_refptr<base::SingleThreadTaskRunner> idle_priority_task_runner,
Delegate* delegate);
- virtual void PostIdleTask(const tracked_objects::Location& from_here,
+ virtual void PostIdleTask(const base::Location& from_here,
const IdleTask& idle_task);
// |idle_task| is eligible to run after the next time an idle period starts
// after |delay|. Note this has after wake-up semantics, i.e. unless
// something else wakes the CPU up, this won't run.
- virtual void PostDelayedIdleTask(const tracked_objects::Location& from_here,
+ virtual void PostDelayedIdleTask(const base::Location& from_here,
const base::TimeDelta delay,
const IdleTask& idle_task);
- virtual void PostNonNestableIdleTask(
- const tracked_objects::Location& from_here,
- const IdleTask& idle_task);
+ virtual void PostNonNestableIdleTask(const base::Location& from_here,
+ const IdleTask& idle_task);
bool RunsTasksInCurrentSequence() const;
@@ -95,8 +94,7 @@
void EnqueueReadyDelayedIdleTasks();
- using DelayedIdleTask =
- std::pair<const tracked_objects::Location, base::Closure>;
+ using DelayedIdleTask = std::pair<const base::Location, base::Closure>;
scoped_refptr<base::SingleThreadTaskRunner> idle_priority_task_runner_;
std::multimap<base::TimeTicks, DelayedIdleTask> delayed_idle_tasks_;
diff --git a/tools/gdb/gdb_chrome.py b/tools/gdb/gdb_chrome.py
index 67e333f..ef42a2c 100644
--- a/tools/gdb/gdb_chrome.py
+++ b/tools/gdb/gdb_chrome.py
@@ -155,7 +155,7 @@
return '%s()@%s:%s' % (self.val['function_name_'].string(),
self.val['file_name_'].string(),
self.val['line_number_'])
-pp_set.add_printer('tracked_objects::Location', '^tracked_objects::Location$',
+pp_set.add_printer('base::Location', '^base::Location$',
LocationPrinter)
diff --git a/ui/accelerated_widget_mac/window_resize_helper_mac.cc b/ui/accelerated_widget_mac/window_resize_helper_mac.cc
index 9d6c944..6079d8fc 100644
--- a/ui/accelerated_widget_mac/window_resize_helper_mac.cc
+++ b/ui/accelerated_widget_mac/window_resize_helper_mac.cc
@@ -65,7 +65,7 @@
const scoped_refptr<base::SingleThreadTaskRunner>& target_task_runner);
// Enqueue WrappedTask and post it to |target_task_runner_|.
- bool EnqueueAndPostWrappedTask(const tracked_objects::Location& from_here,
+ bool EnqueueAndPostWrappedTask(const base::Location& from_here,
WrappedTask* task,
base::TimeDelta delay);
@@ -73,11 +73,11 @@
bool WaitForSingleWrappedTaskToRun(const base::TimeDelta& max_delay);
// base::SingleThreadTaskRunner implementation:
- bool PostDelayedTask(const tracked_objects::Location& from_here,
+ bool PostDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
- bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
+ bool PostNonNestableDelayedTask(const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) override;
@@ -241,7 +241,7 @@
}
bool PumpableTaskRunner::EnqueueAndPostWrappedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
WrappedTask* task,
base::TimeDelta delay) {
task->AddToTaskRunnerQueue(this);
@@ -258,16 +258,15 @@
////////////////////////////////////////////////////////////////////////////////
// PumpableTaskRunner, base::SingleThreadTaskRunner implementation:
-bool PumpableTaskRunner::PostDelayedTask(
- const tracked_objects::Location& from_here,
- base::OnceClosure task,
- base::TimeDelta delay) {
+bool PumpableTaskRunner::PostDelayedTask(const base::Location& from_here,
+ base::OnceClosure task,
+ base::TimeDelta delay) {
return EnqueueAndPostWrappedTask(
from_here, new WrappedTask(std::move(task), delay), delay);
}
bool PumpableTaskRunner::PostNonNestableDelayedTask(
- const tracked_objects::Location& from_here,
+ const base::Location& from_here,
base::OnceClosure task,
base::TimeDelta delay) {
// The correctness of non-nestable events hasn't been proven for this
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
index 27be28e..e8463f4 100644
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -238,7 +238,7 @@
// handle 1's position is matched against the start of selection or the end.
void VerifyHandlePositions(bool cursor_at_selection_handle_1,
bool check_direction,
- const tracked_objects::Location& from_here) {
+ const base::Location& from_here) {
gfx::SelectionBound anchor, focus;
textfield_->GetSelectionEndPoints(&anchor, &focus);
std::string from_str = from_here.ToString();
