Added HostedAppLaunch for testing hosted app shims on Mac.

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/switches.h"
 #include "base/auto_reset.h"
 #include "base/callback.h"
 #include "base/files/file_path_watcher.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/launch_services_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/web_applications/web_app_mac.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/native_app_window.h"
+#include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/test/extension_test_message_listener.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
 namespace {
 
 // General end-to-end test for app shims.
 class AppShimInteractiveTest : public extensions::PlatformAppBrowserTest {
  protected:
   AppShimInteractiveTest()
@@ skipping 101 matching lines @@
   void OnShimQuit(Host* host) override {}
 
  private:
   std::string app_mode_id_;
   bool observed_;
   scoped_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowedAppShimLaunchObserver);
 };
 
+// Watches for a hosted app browser window to open.
+class HostedAppBrowserListObserver : public chrome::BrowserListObserver {
+ public:
+  HostedAppBrowserListObserver(const std::string& app_id)

[tapted, 2014/12/19 05:34:19]

nit: explicit

[mitchellj, 2014/12/21 22:39:44]

Done.

+      : app_id_(app_id), observed_add_(false), observed_removed_(false) {
+    BrowserList::AddObserver(this);
+  }
+
+  ~HostedAppBrowserListObserver() { BrowserList::RemoveObserver(this); }
+
+  void WaitUntilAdded() {
+    if (observed_add_)
+      return;
+
+    run_loop_.reset(new base::RunLoop);
+    run_loop_->Run();
+  }
+
+  void WaitUntilRemoved() {
+    if (observed_removed_)
+      return;
+
+    run_loop_.reset(new base::RunLoop);
+    run_loop_->Run();
+  }
+
+  // BrowserListObserver overrides:
+  void OnBrowserAdded(Browser* browser) override {
+    const extensions::Extension* app =
+        apps::ExtensionAppShimHandler::GetAppForBrowser(browser);
+    if (app && app->id() == app_id_) {
+      observed_add_ = true;
+      if (run_loop_.get())
+        run_loop_->Quit();
+    }
+  }
+
+  void OnBrowserRemoved(Browser* browser) override {
+    const extensions::Extension* app =
+        apps::ExtensionAppShimHandler::GetAppForBrowser(browser);
+    if (app && app->id() == app_id_) {
+      observed_removed_ = true;
+      if (run_loop_.get())
+        run_loop_->Quit();
+    }
+  }
+
+ private:
+  std::string app_id_;
+  bool observed_add_;
+  bool observed_removed_;
+  scoped_ptr<base::RunLoop> run_loop_;
+};

[tapted, 2014/12/19 05:34:19]

nit: DISALLOW_COPY_AND_ASSIGN(HostedAppBrowserListObserver)

[mitchellj, 2014/12/21 22:39:44]

Done.

+
 class AppLifetimeMonitorObserver : public apps::AppLifetimeMonitor::Observer {
  public:
   AppLifetimeMonitorObserver(Profile* profile)
       : profile_(profile), activated_count_(0), deactivated_count_(0) {
     apps::AppLifetimeMonitorFactory::GetForProfile(profile_)->AddObserver(this);
   }
   virtual ~AppLifetimeMonitorObserver() {
     apps::AppLifetimeMonitorFactory::GetForProfile(profile_)
         ->RemoveObserver(this);
   }
@@ skipping 49 matching lines @@
   // is used to wait for file operations on the shim to be finished before
   // attempting to launch it. Since all of the file operations are done in the
   // same event on the FILE thread, everything will be done by the time the
   // watcher's callback is executed.
   scoped_refptr<WindowedFilePathWatcher> file_watcher =
       new WindowedFilePathWatcher(shim_path);
   web_app::UpdateAllShortcuts(base::string16(), profile, app);
   file_watcher->Wait();
 }
 
+Browser* GetFirstHostedAppWindow() {
+  BrowserList* browsers =
+      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
+  for (Browser* browser : *browsers) {
+    const extensions::Extension* extension =
+        apps::ExtensionAppShimHandler::GetAppForBrowser(browser);
+    if (extension && extension->is_hosted_app())
+      return browser;
+  }
+  return NULL;

[tapted, 2014/12/19 05:34:19]

nit: nullptr

[mitchellj, 2014/12/21 22:39:44]

Done.

+}
+
 }  // namespace
 
 // Watches for NSNotifications from the shared workspace.
 @interface WindowedNSNotificationObserver : NSObject {
  @private
   base::scoped_nsobject<NSString> bundleId_;
   BOOL notificationReceived_;
   scoped_ptr<base::RunLoop> runLoop_;
 }
 
@@ skipping 40 matching lines @@
   runLoop_->Run();
 }
 
 @end
 
 namespace apps {
 
 // Shims require static libraries http://crbug.com/386024.
 #if defined(COMPONENT_BUILD)
 #define MAYBE_Launch DISABLED_Launch
+#define MAYBE_HostedAppLaunch DISABLED_HostedAppLaunch
 #define MAYBE_ShowWindow DISABLED_ShowWindow
 #define MAYBE_RebuildShim DISABLED_RebuildShim
 #else
 #define MAYBE_Launch Launch
+#define MAYBE_HostedAppLaunch HostedAppLaunch
 #define MAYBE_ShowWindow ShowWindow
 #define MAYBE_RebuildShim RebuildShim
 #endif
 
+IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_HostedAppLaunch) {
+  const extensions::Extension* app = InstallHostedApp();
+
+  base::FilePath shim_path = GetAppShimPath(profile(), app);
+  EXPECT_FALSE(base::PathExists(shim_path));
+
+  UpdateAppAndAwaitShimCreation(profile(), app, shim_path);
+  ASSERT_TRUE(base::PathExists(shim_path));
+  NSString* bundle_id = GetBundleID(shim_path);
+
+  // Explicitly set the launch type to open in a new window.
+  extensions::SetLaunchType(
+      extensions::ExtensionSystem::Get(profile())->extension_service(),
+      app->id(), extensions::LAUNCH_TYPE_WINDOW);
+
+  // Case 1: Launch the hosted app, it should start the shim.
+  {
+    base::scoped_nsobject<WindowedNSNotificationObserver> ns_observer;
+    ns_observer.reset([[WindowedNSNotificationObserver alloc]
+        initForNotification:NSWorkspaceDidLaunchApplicationNotification
+                andBundleId:bundle_id]);
+    WindowedAppShimLaunchObserver observer(app->id());
+    LaunchHostedApp(app);
+    [ns_observer wait];
+    observer.Wait();
+
+    EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
+    EXPECT_TRUE(GetFirstHostedAppWindow());
+
+    NSArray* running_shim = [NSRunningApplication
+        runningApplicationsWithBundleIdentifier:bundle_id];
+    ASSERT_EQ(1u, [running_shim count]);
+
+    ns_observer.reset([[WindowedNSNotificationObserver alloc]
+        initForNotification:NSWorkspaceDidTerminateApplicationNotification
+                andBundleId:bundle_id]);
+    [base::mac::ObjCCastStrict<NSRunningApplication>(

[tapted, 2014/12/19 05:34:19]

nit: usually we don't bother casting things that return `id` if we're just
calling objc methods on them. i.e. just the following should work:

[[running_shim objectAtIndex:0] terminate];

[mitchellj, 2014/12/21 22:39:44]

Using this instead seems to throw some compiler errors:

app_shim_interactive_uitest_mac.mm:401:5: error: multiple methods named
'terminate' found
    [[running_shim objectAtIndex:0] terminate];
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
NSTask.h:60:1: note: using
- (void)terminate; // Not always possible. Sends SIGTERM.
^~~~~~~~~~~~~~~~~~
NSRunningApplication.h:135:1: note: also found
- (BOOL)terminate;

So I'll leave it casted for now. This is also consistent with the way the tests
are done elsewhere in the file.

+        [running_shim objectAtIndex:0]) terminate];
+    [ns_observer wait];
+
+    EXPECT_FALSE(GetFirstHostedAppWindow());
+    EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
+  }
+
+  // Case 2: Launch the shim, it should start the hosted app.
+  {
+    HostedAppBrowserListObserver listener(app->id());
+    CommandLine shim_cmdline(CommandLine::NO_PROGRAM);
+    shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
+    ProcessSerialNumber shim_psn;
+    ASSERT_TRUE(base::mac::OpenApplicationWithPath(
+        shim_path, shim_cmdline, kLSLaunchDefaults, &shim_psn));
+    listener.WaitUntilAdded();
+
+    ASSERT_TRUE(GetFirstHostedAppWindow());
+    EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
+
+    // If the window is closed, the shim should quit.
+    pid_t shim_pid;
+    EXPECT_EQ(noErr, GetProcessPID(&shim_psn, &shim_pid));
+    GetFirstHostedAppWindow()->window()->Close();
+    // Wait for the window to be closed.
+    listener.WaitUntilRemoved();
+    ASSERT_TRUE(
+        base::WaitForSingleProcess(shim_pid, TestTimeouts::action_timeout()));
+
+    EXPECT_FALSE(GetFirstHostedAppWindow());
+    EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
+  }
+}
+
 // Test that launching the shim for an app starts the app, and vice versa.
 // These two cases are combined because the time to run the test is dominated
 // by loading the extension and creating the shim.
 IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, MAYBE_Launch) {
   const extensions::Extension* app = InstallPlatformApp("minimal");
 
   base::FilePath shim_path = GetAppShimPath(profile(), app);
   EXPECT_FALSE(base::PathExists(shim_path));
 
   UpdateAppAndAwaitShimCreation(profile(), app, shim_path);
@@ skipping 260 matching lines @@
   // the shim is rebuilt.
   WindowedAppShimLaunchObserver(app->id()).Wait();
 
   EXPECT_TRUE(GetFirstAppWindow());
   EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 }
 
 #endif  // defined(ARCH_CPU_64_BITS)
 
 }  // namespace apps