Prepare chrome to use the new Mojo EDK by default.

base/message_loop/message_loop.cc

 // Copyright 2013 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 "base/message_loop/message_loop.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 282 matching lines @@
   DCHECK(pump_);
   RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 void MessageLoop::QuitWhenIdle() {
   DCHECK_EQ(this, current());
   if (run_loop_) {
     run_loop_->quit_when_idle_received_ = true;
   } else {
-    NOTREACHED() << "Must be inside Run to call Quit";
+    // We don't assert that run_loop_ is valid for custom message pumps. Some,
+    // for example MojoMessagePump, might have shutdown already based on other
+    // shutdown signals.
+    if (type_ != MessageLoop::TYPE_CUSTOM) {
+      NOTREACHED() << "Must be inside Run to call Quit";
+    }
   }
 }
 
 void MessageLoop::QuitNow() {
   DCHECK_EQ(this, current());
   if (run_loop_) {
     pump_->Quit();
   } else {
     NOTREACHED() << "Must be inside Run to call Quit";
   }
@@ skipping 434 matching lines @@
       persistent,
       mode,
       controller,
       delegate);
 }
 #endif
 
 #endif  // !defined(OS_NACL_SFI)
 
 }  // namespace base