[Merge to 2924] Reland "Propagate information about how ARC apps are launched"

chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.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 "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "mojo/common/common_type_converters.h"
+#include "ui/events/event_constants.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<arc::mojom::AppInfoPtr, arc::mojom::AppInfo> {
   static arc::mojom::AppInfoPtr Convert(const arc::mojom::AppInfo& app_info) {
     return app_info.Clone();
   }
 };
 
@@ skipping 216 matching lines @@
   StartInstance();
   app_info = app_prefs()->GetApp(app_id);
   ASSERT_TRUE(app_info);
   EXPECT_FALSE(app_info->ready);
   if (is_pinned())
     EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
   else
     EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
 
   // Launching non-ready Arc app creates item on shelf and spinning animation.
-  arc::LaunchApp(profile(), app_id);
+  arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
   EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
   AppAnimatedWaiter(app_id).Wait();
 
   switch (test_action()) {
     case TEST_ACTION_START:
       // Now simulates that Arc is started and app list is refreshed. This
       // should stop animation and delete icon from the shelf.
       InstallTestApps(false);
       SendPackageAdded(false);
       EXPECT_TRUE(chrome_controller()
@@ skipping 97 matching lines @@
 // Test AppListControllerDelegate::IsAppOpen for Arc apps.
 IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, IsAppOpen) {
   StartInstance();
   InstallTestApps(false);
   SendPackageAdded(true);
   const std::string app_id = GetTestApp1Id();
 
   AppListService* service = AppListService::Get();
   AppListControllerDelegate* delegate = service->GetControllerDelegate();
   EXPECT_FALSE(delegate->IsAppOpen(app_id));
-  arc::LaunchApp(profile(), app_id);
+  arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
   EXPECT_FALSE(delegate->IsAppOpen(app_id));
   // Simulate task creation so the app is marked as running/open.
   std::unique_ptr<ArcAppListPrefs::AppInfo> info = app_prefs()->GetApp(app_id);
   app_host()->OnTaskCreated(0, info->package_name, info->activity, info->name);
   EXPECT_TRUE(delegate->IsAppOpen(app_id));
 }