Move launch_service/app_utils to app_service/launch_utils.

Launch_service will be integrated to AppService, and launch_service will
be removed. So modify related components to use app_service/launch_utils.

BUG=1061843

Change-Id: If767a4e91e50cdbc0ec0e5805b88f979a0acfcab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2115856Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753115}

chrome/browser/BUILD.gn

@@ -3097,6 +3097,8 @@ jumbo_static_library("browser") {
       "apps/app_service/app_service_proxy_factory.h",
       "apps/app_service/dip_px_util.cc",
       "apps/app_service/dip_px_util.h",
+      "apps/app_service/launch_utils.cc",
+      "apps/app_service/launch_utils.h",
       "apps/app_service/uninstall_dialog.cc",
       "apps/app_service/uninstall_dialog.h",
       "apps/intent_helper/apps_navigation_throttle.cc",
@@ -3111,8 +3113,6 @@ jumbo_static_library("browser") {
       "apps/intent_helper/intent_picker_auto_display_service_factory.h",
       "apps/intent_helper/page_transition_util.cc",
       "apps/intent_helper/page_transition_util.h",
-      "apps/launch_service/app_utils.cc",
-      "apps/launch_service/app_utils.h",
       "apps/launch_service/extension_app_launch_manager.cc",
       "apps/launch_service/extension_app_launch_manager.h",
       "apps/launch_service/launch_manager.cc",

chrome/browser/apps/launch_service/app_utils.cc → chrome/browser/apps/app_service/launch_utils.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"

chrome/browser/apps/launch_service/app_utils.h → chrome/browser/apps/app_service/launch_utils.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_APPS_LAUNCH_SERVICE_APP_UTILS_H_
-#define CHROME_BROWSER_APPS_LAUNCH_SERVICE_APP_UTILS_H_
+#ifndef CHROME_BROWSER_APPS_APP_SERVICE_LAUNCH_UTILS_H_
+#define CHROME_BROWSER_APPS_APP_SERVICE_LAUNCH_UTILS_H_
 
 #include <string>
 
@@ -25,4 +25,4 @@ void SetAppIdForWebContents(Profile* profile,
 
 }  // namespace apps
 
-#endif  // CHROME_BROWSER_APPS_LAUNCH_SERVICE_APP_UTILS_H_
+#endif  // CHROME_BROWSER_APPS_APP_SERVICE_LAUNCH_UTILS_H_

chrome/browser/extensions/extension_browser_window_helper.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/extension_browser_window_helper.h"
 
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"

chrome/browser/sessions/chrome_tab_restore_service_client.cc

@@ -17,7 +17,7 @@
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/apps/platform_apps/platform_app_launch.h"
 #endif
 

chrome/browser/sessions/session_service.cc

@@ -19,7 +19,7 @@
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"

chrome/browser/ui/browser_live_tab_context.cc

@@ -9,7 +9,7 @@
 
 #include "base/feature_list.h"
 #include "base/token.h"
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"

chrome/browser/ui/browser_navigator.cc

@@ -66,7 +66,7 @@
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/web_applications/components/web_app_helpers.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"

chrome/browser/ui/browser_tabrestore.cc

@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "build/build_config.h"
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"

chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

@@ -20,7 +20,7 @@
 #include "extensions/buildflags/buildflags.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "chrome/browser/apps/launch_service/app_utils.h"
+#include "chrome/browser/apps/app_service/launch_utils.h"
 #endif
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)