Remove calls to MessageLoop::current() in content.

content/renderer/devtools/devtools_agent.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/devtools/devtools_agent.h"
 
 #include <stddef.h>
 
 #include <map>
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.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"
 #include "content/public/common/manifest.h"
 #include "content/renderer/devtools/devtools_client.h"
 #include "content/renderer/devtools/devtools_cpu_throttler.h"
 #include "content/renderer/manifest/manifest_manager.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_widget.h"
 #include "ipc/ipc_channel.h"
@@ skipping 10 matching lines @@
 
 using base::trace_event::TraceLog;
 
 namespace content {
 
 namespace {
 
 const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
 const char kPageGetAppManifest[] = "Page.getAppManifest";
 
+class WebKitClientMessageLoopImpl
+    : public WebDevToolsAgentClient::WebKitClientMessageLoop,
+      public base::NonThreadSafe {
+ public:
+  WebKitClientMessageLoopImpl() { DCHECK(CalledOnValidThread()); }

[jochen (gone - plz use gerrit), 2016/07/06 11:24:52]

how would you ever be able to call the constructor on an invalid thread?

[fdoray, 2016/07/06 14:29:08]

Done.

+  ~WebKitClientMessageLoopImpl() override { DCHECK(CalledOnValidThread()); }
+  void run() override {
+    DCHECK(CalledOnValidThread());
 
-class WebKitClientMessageLoopImpl
-    : public WebDevToolsAgentClient::WebKitClientMessageLoop {
- public:
-  WebKitClientMessageLoopImpl() : message_loop_(base::MessageLoop::current()) {}
-  ~WebKitClientMessageLoopImpl() override { message_loop_ = NULL; }
-  void run() override {
-    base::MessageLoop::ScopedNestableTaskAllower allow(message_loop_);
-    base::RunLoop().Run();
+    base::RunLoop* const previous_run_loop = run_loop_;
+    base::RunLoop run_loop;
+    run_loop_ = &run_loop;
+
+    base::MessageLoop::ScopedNestableTaskAllower allow(
+        base::MessageLoop::current());
+    run_loop.Run();
+
+    run_loop_ = previous_run_loop;
   }
-  void quitNow() override { message_loop_->QuitNow(); }
+  void quitNow() override {
+    DCHECK(CalledOnValidThread());
+    DCHECK(run_loop_);
+
+    run_loop_->Quit();
+  }
 
  private:
-  base::MessageLoop* message_loop_;
+  base::RunLoop* run_loop_ = nullptr;
 };
 
 typedef std::map<int, DevToolsAgent*> IdToAgentMap;
 base::LazyInstance<IdToAgentMap>::Leaky
     g_agent_for_routing_id = LAZY_INSTANCE_INITIALIZER;
 
 } //  namespace
 
 DevToolsAgent::DevToolsAgent(RenderFrameImpl* frame)
     : RenderFrameObserver(frame),
@@ skipping 255 matching lines @@
   result->Set("errors", errors.release());
   response->Set("result", result.release());
 
   std::string json_message;
   base::JSONWriter::Write(*response, &json_message);
   SendChunkedProtocolMessage(this, routing_id(), session_id, call_id,
                              json_message, std::string());
 }
 
 }  // namespace content