Rename OnShimLaunch to OnShimProcessConnected

The previous name was no longer reflective of the behavior. Updated
comments as well.

TBR=dominickn

Change-Id: Id8791c8e4272e51f86ac84c93f94ed06a49f2de7
Reviewed-on: https://chromium-review.googlesource.com/c/1373733Reviewed-by: ccameron <ccameron@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615862}

chrome/browser/apps/app_shim/app_shim_handler_mac.h

@@ -46,12 +46,11 @@ class AppShimHandler {
   // running.
   static bool ShouldRestoreSession();
 
-  // Invoked by the shim host when the shim process is launched. The handler
-  // must call OnAppLaunchComplete to inform the shim of the result.
-  // |launch_type| indicates the type of launch.
-  // |files|, if non-empty, holds an array of files paths given as arguments, or
-  // dragged onto the app bundle or dock icon.
-  virtual void OnShimLaunch(
+  // Invoked by the AppShimHostBootstrap  when a shim process has connected to
+  // the browser process. This will connect to (creating, if needed) an
+  // AppShimHost. |bootstrap| must have OnLaunchAppSucceeded or
+  // OnLaunchAppFailed called on it to inform the shim of the result.
+  virtual void OnShimProcessConnected(
       std::unique_ptr<AppShimHostBootstrap> bootstrap) = 0;
 
   // Invoked by the shim host when the connection to the shim process is closed.

chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.cc

@@ -86,7 +86,7 @@ void AppShimHostBootstrap::LaunchApp(
   // |handler| takes ownership of |this| now.
   apps::AppShimHandler* handler = GetHandler();
   if (handler)
-    handler->OnShimLaunch(std::move(deleter));
+    handler->OnShimProcessConnected(std::move(deleter));
   // |handler| can only be NULL after AppShimHostManager is destroyed. Since
   // this only happens at shutdown, do nothing here.
 }

chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h

@@ -31,7 +31,12 @@ class AppShimHostBootstrap : public chrome::mojom::AppShimHostBootstrap {
   chrome::mojom::AppShimHostRequest GetLaunchAppShimHostRequest();
   const std::string& GetAppId() const { return app_id_; }
   const base::FilePath& GetProfilePath() const { return profile_path_; }
+
+  // Indicates the type of launch (by Chrome or from the app).
   apps::AppShimLaunchType GetLaunchType() const { return launch_type_; }
+
+  // If non-empty, holds an array of file paths given as arguments, or dragged
+  // onto the app bundle or dock icon.
   const std::vector<base::FilePath>& GetLaunchFiles() const { return files_; }
 
  protected:

chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc

@@ -139,7 +139,8 @@ class AppShimHostTest : public testing::Test,
   void SimulateDisconnect() { host_ptr_.reset(); }
 
  protected:
-  void OnShimLaunch(std::unique_ptr<AppShimHostBootstrap> bootstrap) override {
+  void OnShimProcessConnected(
+      std::unique_ptr<AppShimHostBootstrap> bootstrap) override {
     ++launch_count_;
     if (bootstrap->GetLaunchType() == apps::APP_SHIM_LAUNCH_NORMAL)
       ++launch_now_count_;

chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm

@@ -107,8 +107,8 @@ class AppShimHostManagerBrowserTest : public InProcessBrowserTest,
   AppShimHostManagerBrowserTest() : binding_(this) {}
 
  protected:
-  // Wait for OnShimLaunch, then send a quit, and wait for the response. Used to
-  // test launch behavior.
+  // Wait for OnShimProcessConnected, then send a quit, and wait for the
+  // response. Used to test launch behavior.
   void RunAndExitGracefully();
 
   // InProcessBrowserTest overrides:
@@ -116,7 +116,8 @@ class AppShimHostManagerBrowserTest : public InProcessBrowserTest,
   void TearDownOnMainThread() override;
 
   // AppShimHandler overrides:
-  void OnShimLaunch(std::unique_ptr<AppShimHostBootstrap> bootstrap) override;
+  void OnShimProcessConnected(
+      std::unique_ptr<AppShimHostBootstrap> bootstrap) override;
   void OnShimClose(::AppShimHost* host) override {}
   void OnShimFocus(::AppShimHost* host,
                    apps::AppShimFocusType focus_type,
@@ -151,7 +152,7 @@ class AppShimHostManagerBrowserTest : public InProcessBrowserTest,
 void AppShimHostManagerBrowserTest::RunAndExitGracefully() {
   runner_ = std::make_unique<base::RunLoop>();
   EXPECT_EQ(0, launch_count_);
-  runner_->Run();  // Will stop in OnShimLaunch().
+  runner_->Run();  // Will stop in OnShimProcessConnected().
   EXPECT_EQ(1, launch_count_);
 
   runner_ = std::make_unique<base::RunLoop>();
@@ -172,7 +173,7 @@ void AppShimHostManagerBrowserTest::TearDownOnMainThread() {
   apps::AppShimHandler::RemoveHandler(kTestAppMode);
 }
 
-void AppShimHostManagerBrowserTest::OnShimLaunch(
+void AppShimHostManagerBrowserTest::OnShimProcessConnected(
     std::unique_ptr<AppShimHostBootstrap> bootstrap) {
   ++launch_count_;
   binding_.Bind(bootstrap->GetLaunchAppShimHostRequest());

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

@@ -103,11 +103,12 @@ class WindowedAppShimLaunchObserver : public apps::AppShimHandler {
   }
 
   // AppShimHandler overrides:
-  void OnShimLaunch(std::unique_ptr<AppShimHostBootstrap> bootstrap) override {
+  void OnShimProcessConnected(
+      std::unique_ptr<AppShimHostBootstrap> bootstrap) override {
     // Remove self and pass through to the default handler.
     apps::AppShimHandler::RemoveHandler(app_mode_id_);
     apps::AppShimHandler::GetForAppMode(app_mode_id_)
-        ->OnShimLaunch(std::move(bootstrap));
+        ->OnShimProcessConnected(std::move(bootstrap));
     observed_ = true;
     if (run_loop_.get())
       run_loop_->Quit();

chrome/browser/apps/app_shim/apps_page_shim_handler.h

@@ -17,7 +17,8 @@ class AppsPageShimHandler : public apps::AppShimHandler {
   AppsPageShimHandler() {}
 
   // AppShimHandler:
-  void OnShimLaunch(std::unique_ptr<AppShimHostBootstrap> bootstrap) override;
+  void OnShimProcessConnected(
+      std::unique_ptr<AppShimHostBootstrap> bootstrap) override;
   void OnShimClose(AppShimHost* host) override;
   void OnShimFocus(AppShimHost* host,
                    apps::AppShimFocusType focus_type,

chrome/browser/apps/app_shim/apps_page_shim_handler.mm

@@ -53,7 +53,7 @@ void OpenAppsPage(Profile* fallback_profile) {
 
 }  // namespace
 
-void AppsPageShimHandler::OnShimLaunch(
+void AppsPageShimHandler::OnShimProcessConnected(
     std::unique_ptr<AppShimHostBootstrap> bootstrap) {
   AppController* controller =
       base::mac::ObjCCastStrict<AppController>([NSApp delegate]);

chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc

@@ -422,7 +422,7 @@ void ExtensionAppShimHandler::OnChromeWillHide() {
     entry.second->OnAppHide();
 }
 
-void ExtensionAppShimHandler::OnShimLaunch(
+void ExtensionAppShimHandler::OnShimProcessConnected(
     std::unique_ptr<AppShimHostBootstrap> bootstrap) {
   const std::string& app_id = bootstrap->GetAppId();
   AppShimLaunchType launch_type = bootstrap->GetLaunchType();

chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h

@@ -129,7 +129,8 @@ class ExtensionAppShimHandler : public AppShimHandler,
   void OnChromeWillHide();
 
   // AppShimHandler overrides:
-  void OnShimLaunch(std::unique_ptr<AppShimHostBootstrap> bootstrap) override;
+  void OnShimProcessConnected(
+      std::unique_ptr<AppShimHostBootstrap> bootstrap) override;
   void OnShimClose(AppShimHost* host) override;
   void OnShimFocus(AppShimHost* host,
                    AppShimFocusType focus_type,

chrome/browser/apps/app_shim/extension_app_shim_handler_mac_unittest.cc

@@ -542,9 +542,9 @@ TEST_F(ExtensionAppShimHandlerTest, RegisterOnly) {
 }
 
 TEST_F(ExtensionAppShimHandlerTest, LoadProfile) {
-  // If the profile is not loaded when an OnShimLaunch arrives, return false
-  // and load the profile asynchronously. Launch the app when the profile is
-  // ready.
+  // If the profile is not loaded when an OnShimProcessConnected arrives, return
+  // false and load the profile asynchronously. Launch the app when the profile
+  // is ready.
   EXPECT_CALL(*delegate_, ProfileForPath(profile_path_a_))
       .WillOnce(Return(static_cast<Profile*>(NULL)))
       .WillRepeatedly(Return(&profile_a_));