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

mojo/shell/tests/shell/target.cc

Index: mojo/shell/tests/shell/target.cc
diff --git a/mojo/shell/tests/application_manager/target.cc b/mojo/shell/tests/shell/target.cc
similarity index 77%
rename from mojo/shell/tests/application_manager/target.cc
rename to mojo/shell/tests/shell/target.cc
index 25aba82ba78cf7424cae0a1a4c713e5aefc9dae6..d0eeca254420a8c090a102a03d17e196c5608180 100644
--- a/mojo/shell/tests/application_manager/target.cc
+++ b/mojo/shell/tests/shell/target.cc
@@ -10,9 +10,9 @@
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/runner/child/test_native_main.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"
 
-using mojo::shell::test::mojom::CreateInstanceForHandleTestPtr;
+using mojo::shell::test::mojom::CreateInstanceForFactoryTestPtr;
 
 namespace {
 
@@ -25,9 +25,8 @@ class Target : public mojo::ShellClient {
   // mojo::ShellClient:
   void Initialize(mojo::Connector* connector, const std::string& name,
                   uint32_t id, uint32_t user_id) override {
-    CreateInstanceForHandleTestPtr service;
-    connector->ConnectToInterface("mojo:application_manager_unittest",
-                                  &service);
+    CreateInstanceForFactoryTestPtr service;
+    connector->ConnectToInterface("mojo:shell_unittest", &service);
     service->SetTargetID(id);
   }