Rename shell.mojom to connector.mojom, ApplicationManager to Shell

mojo/shell/tests/lifecycle/lifecycle_unittest.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 "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/shell/public/cpp/shell_test.h"
-#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "mojo/shell/runner/common/switches.h"
 #include "mojo/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
 const char kTestAppName[] = "mojo:lifecycle_unittest_app";
 const char kTestExeName[] = "exe:lifecycle_unittest_exe";
 const char kTestPackageName[] = "mojo:lifecycle_unittest_package";
@@ skipping 175 matching lines @@
     // Allocate the pipe locally.
     mojo::ScopedMessagePipeHandle pipe =
         mojo::edk::CreateParentMessagePipe(primordial_pipe_token);
 
     mojo::shell::mojom::CapabilityFilterPtr filter(
         mojo::shell::mojom::CapabilityFilter::New());
     mojo::Array<mojo::String> test_interfaces;
     test_interfaces.push_back("*");
     filter->filter.insert("*", std::move(test_interfaces));
 
-    mojo::shell::mojom::ApplicationManagerPtr application_manager;
-    connector()->ConnectToInterface("mojo:shell", &application_manager);
+    mojo::shell::mojom::ShellPtr shell;
+    connector()->ConnectToInterface("mojo:shell", &shell);
 
     mojo::shell::mojom::ShellClientFactoryPtr factory;
     factory.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClientFactory>(
         std::move(pipe), 0u));
 
-    application_manager->CreateInstanceForFactory(
-        std::move(factory), kTestExeName, mojom::Connector::kUserInherit,
-        std::move(filter), std::move(request));
+    shell->CreateInstanceForFactory(std::move(factory), kTestExeName,
+                                    mojom::Connector::kUserInherit,
+                                    std::move(filter), std::move(request));
 
     base::LaunchOptions options;
   #if defined(OS_WIN)
     options.handles_to_inherit = &handle_passing_info;
   #elif defined(OS_POSIX)
     options.fds_to_remap = &handle_passing_info;
   #endif
     base::Process process = base::LaunchProcess(child_command_line, options);
     DCHECK(process.IsValid());
     receiver->SetPID(process.Pid());
@@ skipping 11 matching lines @@
   InstanceState* instances() { return instances_.get(); }
 
   void WaitForInstanceDestruction() {
     base::RunLoop loop;
     instances()->WaitForInstanceDestruction(&loop);
     loop.Run();
   }
 
  private:
   scoped_ptr<InstanceState> TrackInstances() {
-    mojom::ApplicationManagerPtr am;
-    connector()->ConnectToInterface("mojo:shell", &am);
+    mojom::ShellPtr shell;
+    connector()->ConnectToInterface("mojo:shell", &shell);
     mojom::InstanceListenerPtr listener;
     base::RunLoop loop;
     InstanceState* state = new InstanceState(GetProxy(&listener), &loop);
-    am->AddInstanceListener(std::move(listener));
+    shell->AddInstanceListener(std::move(listener));
     loop.Run();
     return make_scoped_ptr(state);
   }
 
   scoped_ptr<InstanceState> instances_;
 
   DISALLOW_COPY_AND_ASSIGN(LifecycleTest);
 };
 
 TEST_F(LifecycleTest, Standalone_GracefulQuit) {
@@ skipping 228 matching lines @@
   loop.Run();
 
   WaitForInstanceDestruction();
   EXPECT_FALSE(instances()->HasInstanceForName(kTestExeName));
   EXPECT_EQ(0u, instances()->GetNewInstanceCount());
 }
 
 
 }  // namespace shell
 }  // namespace mojo