| Index: content/renderer/devtools/devtools_agent.cc
|
| diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
|
| index a9b2b5929bb756df2ab7a1268eb8ba4a0f3251f7..b995c0d9d6fd83cd1e62e2382a1e3afe0f8bd9a3 100644
|
| --- a/content/renderer/devtools/devtools_agent.cc
|
| +++ b/content/renderer/devtools/devtools_agent.cc
|
| @@ -12,8 +12,8 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| +#include "base/sequence_checker.h"
|
| #include "base/strings/string_number_conversions.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "content/common/devtools_messages.h"
|
| #include "content/common/frame_messages.h"
|
| @@ -46,13 +46,14 @@ const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
|
| const char kPageGetAppManifest[] = "Page.getAppManifest";
|
|
|
| class WebKitClientMessageLoopImpl
|
| - : public WebDevToolsAgentClient::WebKitClientMessageLoop,
|
| - public base::NonThreadSafe {
|
| + : public WebDevToolsAgentClient::WebKitClientMessageLoop {
|
| public:
|
| WebKitClientMessageLoopImpl() = default;
|
| - ~WebKitClientMessageLoopImpl() override { DCHECK(CalledOnValidThread()); }
|
| + ~WebKitClientMessageLoopImpl() override {
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| + }
|
| void Run() override {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
|
|
| base::RunLoop* const previous_run_loop = run_loop_;
|
| base::RunLoop run_loop;
|
| @@ -65,7 +66,7 @@ class WebKitClientMessageLoopImpl
|
| run_loop_ = previous_run_loop;
|
| }
|
| void QuitNow() override {
|
| - DCHECK(CalledOnValidThread());
|
| + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
| DCHECK(run_loop_);
|
|
|
| run_loop_->Quit();
|
| @@ -73,6 +74,8 @@ class WebKitClientMessageLoopImpl
|
|
|
| private:
|
| base::RunLoop* run_loop_ = nullptr;
|
| +
|
| + SEQUENCE_CHECKER(sequence_checker_);
|
| };
|
|
|
| typedef std::map<int, DevToolsAgent*> IdToAgentMap;
|
|
|