diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 15:06:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:48:58 +0000 |
commit | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch) | |
tree | 96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/content/browser/browser_thread_impl.h | |
parent | be59a35641616a4cf23c4a13fa0632624b021c1b (diff) | |
download | qtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz |
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content/browser/browser_thread_impl.h')
-rw-r--r-- | chromium/content/browser/browser_thread_impl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chromium/content/browser/browser_thread_impl.h b/chromium/content/browser/browser_thread_impl.h index 51adc53d063..a9eca4ca5c7 100644 --- a/chromium/content/browser/browser_thread_impl.h +++ b/chromium/content/browser/browser_thread_impl.h @@ -18,7 +18,7 @@ class MessageLoop; class RunLoop; } -namespace tracked_objects { +namespace base { class Location; } @@ -54,8 +54,6 @@ class CONTENT_EXPORT BrowserThreadImpl : public BrowserThread, // Can only be called after a matching RedirectThreadIDToTaskRunner call. static void StopRedirectionOfThreadID(BrowserThread::ID identifier); - static void ShutdownThreadPool(); - // Resets globals for |identifier|. Used in tests to clear global state that // would otherwise leak to the next test. Globals are not otherwise fully // cleaned up in ~BrowserThreadImpl() as there are subtle differences between @@ -86,7 +84,7 @@ class CONTENT_EXPORT BrowserThreadImpl : public BrowserThread, void IOThreadRun(base::RunLoop* run_loop); static bool PostTaskHelper(BrowserThread::ID identifier, - const tracked_objects::Location& from_here, + const base::Location& from_here, base::OnceClosure task, base::TimeDelta delay, bool nestable); @@ -97,7 +95,6 @@ class CONTENT_EXPORT BrowserThreadImpl : public BrowserThread, // For testing. friend class ContentTestSuiteBaseListener; friend class TestBrowserThreadBundle; - static void FlushThreadPoolHelperForTesting(); // The identifier of this thread. Only one thread can exist with a given // identifier at a given time. |