Make HandleWatcher watch on the same thread if the thread is running a MessagePumpMojo.

mojo/public/cpp/application/lib/application_runner_chromium.cc

 // Copyright 2014 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 "mojo/public/cpp/application/application_runner_chromium.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "mojo/common/message_pump_mojo.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 
 namespace mojo {
 
 // static
 void ApplicationImpl::Terminate() {
   if (base::MessageLoop::current()->is_running())
     base::MessageLoop::current()->Quit();
 }
 
 ApplicationRunnerChromium::ApplicationRunnerChromium(
     ApplicationDelegate* delegate)
     : delegate_(scoped_ptr<ApplicationDelegate>(delegate)),
-      message_loop_type_(base::MessageLoop::TYPE_DEFAULT) {}
+      message_loop_type_(base::MessageLoop::TYPE_CUSTOM) {}
 
 ApplicationRunnerChromium::~ApplicationRunnerChromium() {}
 
 void ApplicationRunnerChromium::set_message_loop_type(
     base::MessageLoop::Type type) {
-  DCHECK_EQ(base::MessageLoop::TYPE_DEFAULT, message_loop_type_);
+  DCHECK_EQ(base::MessageLoop::TYPE_CUSTOM, message_loop_type_);

[darin (slow to review), 2014/08/27 21:20:43]

I don't understand this assertion. Why is it invalid to change the message loop
type multiple times? Perhaps what we should do is assert that
set_message_loop_type is not called with TYPE_CUSTOM? And, we should probably
assert that it is not called after Run is called since it would have no effect
at that point.

It seems like set_message_loop_type() is also an unfortunate API if we want to
get rid of the TYPE_* enum, but changing that can wait for another day.

[yzshen1, 2014/08/27 22:31:48]

I honestly didn't think about it. :)
Done.
Okay. Thanks!

   message_loop_type_ = type;
 }
 
 MojoResult ApplicationRunnerChromium::Run(MojoHandle shell_handle) {
   base::CommandLine::Init(0, NULL);
 #if !defined(COMPONENT_BUILD)
   base::AtExitManager at_exit;
 #endif
 
   {
-    base::MessageLoop loop(message_loop_type_);
+    scoped_ptr<base::MessageLoop> loop;
+    if (message_loop_type_ == base::MessageLoop::TYPE_CUSTOM) {
+      loop.reset(new base::MessageLoop(common::MessagePumpMojo::Create()));
+    } else {
+      loop.reset(new base::MessageLoop(message_loop_type_));
+    }
+
     ApplicationImpl impl(delegate_.get(),
                          MakeScopedHandle(MessagePipeHandle(shell_handle)));
-    loop.Run();
+    loop->Run();
   }
   delegate_.reset();
   return MOJO_RESULT_OK;
 }
 
 }  // namespace mojo