Simplify mojo_shell since it's now only used for Mandoline.

mojo/services/window_manager/window_manager_apptest.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 "base/bind.h"
 #include "base/run_loop.h"
+#include "mojo/application/application_test_base_chromium.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_client_factory.h"
 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"
 #include "third_party/mojo_services/src/window_manager/public/interfaces/window_manager.mojom.h"
 
 namespace mojo {
 namespace {
 
@@ skipping 57 matching lines @@
 
 class WindowManagerApplicationTest : public test::ApplicationTestBase {
  public:
   WindowManagerApplicationTest() {}
   ~WindowManagerApplicationTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
-    application_impl()->ConnectToService("mojo:window_manager",
+    application_impl()->ConnectToService("mojo:test_window_manager",
                                          &window_manager_);
   }
   ApplicationDelegate* GetApplicationDelegate() override {
     return &test_application_;
   }
 
   void EmbedApplicationWithURL(const std::string& url) {
     window_manager_->Embed(url, nullptr, nullptr);
 
     base::RunLoop run_loop;
@@ skipping 105 matching lines @@
   // This call fails if the WindowManager does not have a FocusController.
   EXPECT_EQ(0u, capture_view_id);
   EXPECT_EQ(0u, focused_view_id);
   EXPECT_EQ(0u, active_view_id);
 }
 
 // TODO(msw): Write tests exercising other WindowManager functionality.
 
 }  // namespace
 }  // namespace mojo