Make nesting/running states a RunLoop rather than a MessageLoop concept.

services/service_manager/tests/lifecycle/package.cc

 // Copyright 2016 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 <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 #include "services/service_manager/tests/lifecycle/app_client.h"
 #include "services/service_manager/tests/lifecycle/lifecycle_unittest.mojom.h"
 
 namespace {
@@ skipping 125 matching lines @@
   }
 
   void DestroyService(int id) {
     auto id_it = id_to_context_.find(id);
     DCHECK(id_it != id_to_context_.end());
 
     auto it = contexts_.find(id_it->second);
     DCHECK(it != contexts_.end());
     contexts_.erase(it);
     id_to_context_.erase(id_it);
-    if (contexts_.empty() && base::MessageLoop::current()->is_running())
+    if (contexts_.empty() && base::RunLoop::IsRunningOnCurrentThread())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   service_manager::test::AppClient app_client_;
   int service_manager_connection_refcount_ = 0;
   service_manager::BinderRegistry registry_;
   mojo::BindingSet<service_manager::mojom::ServiceFactory> bindings_;
 
   using ServiceContextMap =
       std::map<service_manager::ServiceContext*,
                std::unique_ptr<service_manager::ServiceContext>>;
   ServiceContextMap contexts_;
 
   int next_id_ = 0;
   std::map<int, service_manager::ServiceContext*> id_to_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Package);
 };
 
 }  // namespace
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new Package);
   return runner.Run(service_request_handle);
 }