Handle legacy camera app in consolidated icon

This CL does 2 things:
1. Hide legacy camera app icon
2. Launch legacy camera app (com.android.camera2) when
com.google.android.GoogleCameraArc is not available.

Sometimes when devices are upgraded from version with Camera2 installed,
GCA still has com.android.camera2 as the package name. That's why this
CL is needed.

Bug: b:112121210
Test: Tested on nautilus that after this CL, the legacy camera app icon

Change-Id: I16e4d29d4cb538bd2ad6607456bcf4667be1f188
Reviewed-on: https://chromium-review.googlesource.com/1127899Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Sheng-hao Tsao <shenghao@google.com>
Cr-Commit-Position: refs/heads/master@{#581047}

chrome/browser/ui/app_list/arc/arc_app_utils.cc

@@ -85,10 +85,11 @@ constexpr char kLaunchFlags[] = "launchFlags";
 constexpr char kAndroidClockAppId[] = "ddmmnabaeomoacfpfjgghfpocfolhjlg";
 constexpr char kAndroidFilesAppId[] = "gmiohhmfhgfclpeacmdfancbipocempm";
 constexpr char kAndroidCameraAppId[] = "goamfaniemdfcajgcmmflhchgkmbngka";
+constexpr char kAndroidLegacyCameraAppId[] = "obfofkigjfamlldmipdegnjlcpincibc";
 
 constexpr char const* kAppIdsHiddenInLauncher[] = {
-    kAndroidClockAppId, kSettingsAppId, kAndroidFilesAppId,
-    kAndroidCameraAppId};
+    kAndroidClockAppId, kSettingsAppId, kAndroidFilesAppId, kAndroidCameraAppId,
+    kAndroidLegacyCameraAppId};
 
 // Returns true if |event_flags| came from a mouse or touch event.
 bool IsMouseOrTouchEventFromFlags(int event_flags) {

chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc

@@ -46,6 +46,7 @@ namespace app_list {
 namespace {
 constexpr char kChromeCameraAppId[] = "hfhhnacclhffhdffklopdkcgdhifgngh";
 constexpr char kAndroidCameraAppId[] = "goamfaniemdfcajgcmmflhchgkmbngka";
+constexpr char kAndroidLegacyCameraAppId[] = "obfofkigjfamlldmipdegnjlcpincibc";
 }  // namespace
 
 const std::vector<InternalApp>& GetInternalAppList() {
@@ -121,9 +122,13 @@ void ShowCameraApp(const std::string& app_id,
   AppListClientImpl* controller = AppListClientImpl::GetInstance();
   if (arc_enabled && (!extension || media_consolidated)) {
     // Open ARC++ camera app.
-    arc::LaunchApp(profile, kAndroidCameraAppId, event_flags,
-                   arc::UserInteractionType::APP_STARTED_FROM_LAUNCHER,
-                   controller->GetAppListDisplayId());
+    if (!arc::LaunchApp(profile, kAndroidCameraAppId, event_flags,
+                        arc::UserInteractionType::APP_STARTED_FROM_LAUNCHER,
+                        controller->GetAppListDisplayId())) {
+      arc::LaunchApp(profile, kAndroidLegacyCameraAppId, event_flags,
+                     arc::UserInteractionType::APP_STARTED_FROM_LAUNCHER,
+                     controller->GetAppListDisplayId());
+    }
   } else if (extension) {
     // Open Chrome camera app.
     AppLaunchParams params = CreateAppLaunchParamsWithEventFlags(