Revert "Show consolidated camera icon on shelf"

This reverts commit 1de878d8.

Reason for revert: Causes many crashes like
https://bugs.chromium.org/p/chromium/issues/detail?id=903443
https://buganizer.corp.google.com/issues/119116273


Original change's description:
> Show consolidated camera icon on shelf
> 
> This CL fixes 2 bugs:
> 
> 1. Users might pin the internal app to the shelf. Clicking on it would
> launch a real camera app, causing 2 camera icons shown on the shelf.
> 2. Users might pin the currently running camera app on the shelf. If the
> users click on it afterward, it will bypass the internal app deciding
> logic and always launch that specific app.
> 
> pinned the internal camera app icon, and launching camera app from it
> does not show 2 camera icons on shelf.
> 
> Bug: b:117909556
> Test: Tested on eve that pinning camera app on launcher or on shelf both
> Change-Id: I0300456595e6c4c00c1a47f7a3bc7309d1230553
> Reviewed-on: https://chromium-review.googlesource.com/c/1303327
> Commit-Queue: Sheng-hao Tsao <shenghao@google.com>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Reviewed-by: Tao Wu <wutao@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#603793}

TBR=stevenjb@chromium.org,shenghao@google.com,wutao@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: b:117909556
Change-Id: I20f4ea5762b29dbdbba0ad08592ff3755f06c023
Reviewed-on: https://chromium-review.googlesource.com/c/1328632Reviewed-by: Ricky Liang <jcliang@chromium.org>
Commit-Queue: Ricky Liang <jcliang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607914}

chrome/browser/ui/ash/launcher/arc_app_window.cc

@@ -99,11 +99,8 @@ void ArcAppWindow::SetDefaultAppIcon() {
         profile_, extension_misc::EXTENSION_ICON_SMALL, this);
   }
   DCHECK(!image_fetching_);
-  std::string app_id = app_shelf_id_.ToString();
-  if (app_icon_loader_->CanLoadImageForApp(app_id)) {
-    base::AutoReset<bool> auto_image_fetching(&image_fetching_, true);
-    app_icon_loader_->FetchImage(app_id);
-  }
+  base::AutoReset<bool> auto_image_fetching(&image_fetching_, true);
+  app_icon_loader_->FetchImage(app_shelf_id_.ToString());
 }
 
 void ArcAppWindow::SetIcon(const gfx::ImageSkia& icon) {

chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/public/cpp/app_list/internal_app_id_constants.h"
 #include "ash/public/cpp/app_types.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/window_properties.h"
@@ -36,17 +35,6 @@ namespace {
 
 constexpr size_t kMaxIconPngSize = 64 * 1024;  // 64 kb
 
-// Generated as ArcAppListPrefs::GetAppIdByPackageName(
-//     "com.google.android.GoogleCameraArc").
-constexpr char kAndroidCameraAppId[] = "goamfaniemdfcajgcmmflhchgkmbngka";
-// Generated as ArcAppListPrefs::GetAppIdByPackageName(
-//     "com.android.camera2").
-constexpr char kAndroidLegacyCameraAppId[] = "obfofkigjfamlldmipdegnjlcpincibc";
-// Generated as ArcAppListPrefs::GetAppIdByPackageName(
-//     "com.android.googlecameramigration").
-constexpr char kAndroidCameraMigrationAppId[] =
-    "ngmkobaiicipbagcngcmilfkhejlnfci";
-
 }  // namespace
 
 // The information about the arc application window which has to be kept
@@ -307,17 +295,8 @@ void ArcAppWindowLauncherController::OnTaskCreated(
   DCHECK(!GetAppWindowForTask(task_id));
   const std::string arc_app_id =
       ArcAppListPrefs::GetAppId(package_name, activity_name);
-  std::string app_id_consolidated = arc_app_id;
-
-  // For camera app, always put the internal app icon onto shelf.
-  if (arc_app_id.compare(kAndroidCameraAppId) == 0 ||
-      arc_app_id.compare(kAndroidCameraMigrationAppId) == 0 ||
-      arc_app_id.compare(kAndroidLegacyCameraAppId) == 0) {
-    app_id_consolidated = app_list::kInternalAppIdCamera;
-  }
-
   const arc::ArcAppShelfId arc_app_shelf_id =
-      arc::ArcAppShelfId::FromIntentAndAppId(intent, app_id_consolidated);
+      arc::ArcAppShelfId::FromIntentAndAppId(intent, arc_app_id);
   task_id_to_app_window_info_[task_id] =
       std::make_unique<AppWindowInfo>(arc_app_shelf_id, intent, package_name);
   // Don't create shelf icon for non-primary user.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc

@@ -6,7 +6,6 @@
 
 #include <memory>
 
-#include "ash/public/cpp/app_list/internal_app_id_constants.h"
 #include "ash/public/cpp/shelf_model.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/window_properties.h"
@@ -29,8 +28,6 @@ using extensions::AppWindowRegistry;
 
 namespace {
 
-constexpr char kChromeCameraAppId[] = "hfhhnacclhffhdffklopdkcgdhifgngh";
-
 // Get the ShelfID for a given |app_window|.
 ash::ShelfID GetShelfId(AppWindow* app_window) {
   // Set launch_id default value to an empty string. If showInShelf parameter
@@ -43,12 +40,7 @@ ash::ShelfID GetShelfId(AppWindow* app_window) {
     else
       launch_id = base::StringPrintf("%d", app_window->session_id().id());
   }
-
-  // For camera app, always put the internal app icon onto shelf.
-  std::string app_id = app_window->extension_id();
-  if (app_id.compare(kChromeCameraAppId) == 0)
-    app_id = app_list::kInternalAppIdCamera;
-  return ash::ShelfID(app_id, launch_id);
+  return ash::ShelfID(app_window->extension_id(), launch_id);
 }
 
 }  // namespace