Commit 0c2f7f1a authored by Dominic Farolino's avatar Dominic Farolino Committed by Commit Bot

Remove unnecessary BrowserTaskExecutor methods

This CL removes BaseBrowserTaskExecutor::GetCurrentThreadID() and its
overrides, which are no longer used.

Bug: N/A
Change-Id: I913eb7e01ecf50693e8281f3bb216d006e5a21f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386655
Commit-Queue: Dominic Farolino <dom@chromium.org>
Reviewed-by: default avatarAlexander Timin <altimin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803310}
parent 518f797b
...@@ -336,12 +336,6 @@ std::unique_ptr<BrowserProcessSubThread> BrowserTaskExecutor::CreateIOThread() { ...@@ -336,12 +336,6 @@ std::unique_ptr<BrowserProcessSubThread> BrowserTaskExecutor::CreateIOThread() {
return io_thread; return io_thread;
} }
BrowserThread::ID BrowserTaskExecutor::GetCurrentThreadID() const {
NOTREACHED()
<< "Should have been routed to UIThreadExecutor or IOThreadExecutor";
return BrowserThread::UI;
}
BrowserTaskExecutor::UIThreadExecutor::UIThreadExecutor( BrowserTaskExecutor::UIThreadExecutor::UIThreadExecutor(
std::unique_ptr<BrowserUIThreadScheduler> browser_ui_thread_scheduler) std::unique_ptr<BrowserUIThreadScheduler> browser_ui_thread_scheduler)
: browser_ui_thread_scheduler_(std::move(browser_ui_thread_scheduler)) { : browser_ui_thread_scheduler_(std::move(browser_ui_thread_scheduler)) {
...@@ -368,11 +362,6 @@ void BrowserTaskExecutor::UIThreadExecutor::SetIOThreadHandle( ...@@ -368,11 +362,6 @@ void BrowserTaskExecutor::UIThreadExecutor::SetIOThreadHandle(
browser_io_thread_handle_ = std::move(io_thread_handle); browser_io_thread_handle_ = std::move(io_thread_handle);
} }
BrowserThread::ID BrowserTaskExecutor::UIThreadExecutor::GetCurrentThreadID()
const {
return BrowserThread::UI;
}
BrowserTaskExecutor::IOThreadExecutor::IOThreadExecutor( BrowserTaskExecutor::IOThreadExecutor::IOThreadExecutor(
std::unique_ptr<BrowserIOThreadDelegate> browser_io_thread_delegate) std::unique_ptr<BrowserIOThreadDelegate> browser_io_thread_delegate)
: browser_io_thread_delegate_(std::move(browser_io_thread_delegate)) { : browser_io_thread_delegate_(std::move(browser_io_thread_delegate)) {
...@@ -395,9 +384,4 @@ void BrowserTaskExecutor::IOThreadExecutor::SetUIThreadHandle( ...@@ -395,9 +384,4 @@ void BrowserTaskExecutor::IOThreadExecutor::SetUIThreadHandle(
browser_ui_thread_handle_ = std::move(ui_thread_handle); browser_ui_thread_handle_ = std::move(ui_thread_handle);
} }
BrowserThread::ID BrowserTaskExecutor::IOThreadExecutor::GetCurrentThreadID()
const {
return BrowserThread::IO;
}
} // namespace content } // namespace content
...@@ -75,8 +75,6 @@ class CONTENT_EXPORT BaseBrowserTaskExecutor : public base::TaskExecutor { ...@@ -75,8 +75,6 @@ class CONTENT_EXPORT BaseBrowserTaskExecutor : public base::TaskExecutor {
const base::TaskTraits& traits); const base::TaskTraits& traits);
protected: protected:
virtual BrowserThread::ID GetCurrentThreadID() const = 0;
scoped_refptr<BrowserUIThreadScheduler::Handle> browser_ui_thread_handle_; scoped_refptr<BrowserUIThreadScheduler::Handle> browser_ui_thread_handle_;
scoped_refptr<BrowserIOThreadDelegate::Handle> browser_io_thread_handle_; scoped_refptr<BrowserIOThreadDelegate::Handle> browser_io_thread_handle_;
}; };
...@@ -196,8 +194,6 @@ class CONTENT_EXPORT BrowserTaskExecutor : public BaseBrowserTaskExecutor { ...@@ -196,8 +194,6 @@ class CONTENT_EXPORT BrowserTaskExecutor : public BaseBrowserTaskExecutor {
void BindToCurrentThread(); void BindToCurrentThread();
private: private:
BrowserThread::ID GetCurrentThreadID() const override;
std::unique_ptr<BrowserUIThreadScheduler> browser_ui_thread_scheduler_; std::unique_ptr<BrowserUIThreadScheduler> browser_ui_thread_scheduler_;
bool bound_to_thread_ = false; bool bound_to_thread_ = false;
}; };
...@@ -221,8 +217,6 @@ class CONTENT_EXPORT BrowserTaskExecutor : public BaseBrowserTaskExecutor { ...@@ -221,8 +217,6 @@ class CONTENT_EXPORT BrowserTaskExecutor : public BaseBrowserTaskExecutor {
} }
private: private:
BrowserThread::ID GetCurrentThreadID() const override;
std::unique_ptr<BrowserIOThreadDelegate> browser_io_thread_delegate_; std::unique_ptr<BrowserIOThreadDelegate> browser_io_thread_delegate_;
}; };
...@@ -246,8 +240,6 @@ class CONTENT_EXPORT BrowserTaskExecutor : public BaseBrowserTaskExecutor { ...@@ -246,8 +240,6 @@ class CONTENT_EXPORT BrowserTaskExecutor : public BaseBrowserTaskExecutor {
std::unique_ptr<BrowserIOThreadDelegate> browser_io_thread_delegate); std::unique_ptr<BrowserIOThreadDelegate> browser_io_thread_delegate);
~BrowserTaskExecutor() override; ~BrowserTaskExecutor() override;
BrowserThread::ID GetCurrentThreadID() const override;
static BrowserTaskExecutor* Get(); static BrowserTaskExecutor* Get();
std::unique_ptr<UIThreadExecutor> ui_thread_executor_; std::unique_ptr<UIThreadExecutor> ui_thread_executor_;
......
...@@ -136,11 +136,6 @@ class BrowserTaskTraitsMappingTest : public BrowserTaskExecutorTest { ...@@ -136,11 +136,6 @@ class BrowserTaskTraitsMappingTest : public BrowserTaskExecutorTest {
class TestExecutor : public BaseBrowserTaskExecutor { class TestExecutor : public BaseBrowserTaskExecutor {
public: public:
~TestExecutor() override = default; ~TestExecutor() override = default;
BrowserThread::ID GetCurrentThreadID() const override {
NOTREACHED();
return BrowserThread::UI;
}
}; };
private: private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment