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

mojo/shell/tests/shell/driver.cc

Index: mojo/shell/tests/shell/driver.cc
diff --git a/mojo/shell/tests/application_manager/driver.cc b/mojo/shell/tests/shell/driver.cc
similarity index 85%
rename from mojo/shell/tests/application_manager/driver.cc
rename to mojo/shell/tests/shell/driver.cc
index 9a8b0bff4e9c588a525bd6df32b1261160e0c2a0..d8ea10f7db46ae00584331cb05dc0c5f6ddf553b 100644
--- a/mojo/shell/tests/application_manager/driver.cc
+++ b/mojo/shell/tests/shell/driver.cc
@@ -26,12 +26,12 @@
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
-#include "mojo/shell/public/interfaces/application_manager.mojom.h"
+#include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "mojo/shell/runner/child/test_native_main.h"
 #include "mojo/shell/runner/common/switches.h"
 #include "mojo/shell/runner/init.h"
-#include "mojo/shell/tests/application_manager/application_manager_unittest.mojom.h"
+#include "mojo/shell/tests/shell/shell_unittest.mojom.h"
 
 namespace {
 
@@ -50,10 +50,10 @@ class Driver : public mojo::ShellClient,
     CHECK(base::PathService::Get(base::DIR_EXE, &target_path));
   #if defined(OS_WIN)
     target_path = target_path.Append(
-        FILE_PATH_LITERAL("application_manager_unittest_target.exe"));
+        FILE_PATH_LITERAL("shell_unittest_target.exe"));
   #else
     target_path = target_path.Append(
-        FILE_PATH_LITERAL("application_manager_unittest_target"));
+        FILE_PATH_LITERAL("shell_unittest_target"));
   #endif
 
     base::CommandLine child_command_line(target_path);
@@ -89,20 +89,19 @@ class Driver : public mojo::ShellClient,
         mojo::shell::mojom::CapabilityFilter::New());
     mojo::Array<mojo::String> test_interfaces;
     test_interfaces.push_back(
-        mojo::shell::test::mojom::CreateInstanceForHandleTest::Name_);
-    filter->filter.insert("mojo:application_manager_unittest",
-                          std::move(test_interfaces));
+        mojo::shell::test::mojom::CreateInstanceForFactoryTest::Name_);
+    filter->filter.insert("mojo:shell_unittest", std::move(test_interfaces));
 
     mojo::shell::mojom::ShellClientFactoryPtr factory;
     factory.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClientFactory>(
         std::move(pipe), 0u));
 
-    mojo::shell::mojom::ApplicationManagerPtr application_manager;
-    connector->ConnectToInterface("mojo:shell", &application_manager);
-    application_manager->CreateInstanceForFactory(
-        std::move(factory), "exe:application_manager_unittest_target",
-        mojo::shell::mojom::Connector::kUserInherit, std::move(filter),
-        std::move(request));
+    mojo::shell::mojom::ShellPtr shell;
+    connector->ConnectToInterface("mojo:shell", &shell);
+    shell->CreateInstanceForFactory(std::move(factory),
+                                    "exe:shell_unittest_target",
+                                    mojo::shell::mojom::Connector::kUserInherit,
+                                    std::move(filter), std::move(request));
 
     base::LaunchOptions options;
   #if defined(OS_WIN)