Remove Lacros leftovers from apps/

Lacros is gone.

- Replace IS_CHROMEOS_ASH uses with IS_CHROMEOS.
- Replace is_chromeos uses with is_chromeos.
- Remove IS_CHROMEOS_LACROS uses.
- Where appropriate, remove includes of build/chromeos_buildflags.h or
  replace with build/build_config.h.
- Remove imports of build/config/chromeos/ui_mode.gni.

Bug: b:354842935
Change-Id: Idb9a3ecdb3253364c7a831d05b3c8e60c70e146d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6242314
Commit-Queue: Stefan Kuhne <skuhne@chromium.org>
Auto-Submit: Georg Neis <neis@chromium.org>
Reviewed-by: Stefan Kuhne <skuhne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1417411}

apps/BUILD.gn

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//extensions/buildflags/buildflags.gni")
@@ -39,7 +38,6 @@ static_library("apps") {
 
   deps = [
     "//base",
-    "//build:chromeos_buildflags",
     "//components/keyed_service/content",
     "//content/public/browser",
     "//content/public/common",
@@ -48,7 +46,7 @@ static_library("apps") {
     "//extensions/common/api",
   ]
 
-  if (is_chromeos_ash) {
+  if (is_chromeos) {
     deps += [
       "//components/app_restore",
       "//components/user_manager",

apps/app_restore_service.cc

@@ -8,7 +8,7 @@
 #include "apps/app_restore_service_factory.h"
 #include "apps/launcher.h"
 #include "apps/saved_files_service.h"
-#include "build/chromeos_buildflags.h"
+#include "build/build_config.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/extension_host.h"
@@ -28,8 +28,8 @@ namespace apps {
 // static
 bool AppRestoreService::ShouldRestoreApps(bool is_browser_restart) {
   bool should_restore_apps = is_browser_restart;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
-  // Chromeos always restarts apps, even if it was a regular shutdown.
+  // ChromeOS always restarts apps, even if it was a regular shutdown.
   should_restore_apps = true;
 #endif
   return should_restore_apps;

apps/launcher.cc

@@ -21,7 +21,6 @@
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "components/services/app_service/public/cpp/file_handler_info.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -398,7 +397,7 @@ void LaunchPlatformAppWithCommandLineAndLaunchId(
   // check in case this scenario does occur.
   if (extensions::KioskModeInfo::IsKioskOnly(app)) {
     bool in_kiosk_mode = false;
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
     user_manager::UserManager* user_manager = user_manager::UserManager::Get();
     in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp();
 #endif
@@ -475,7 +474,7 @@ void LaunchPlatformAppWithFileHandler(
     const Extension* app,
     const std::string& handler_id,
     const std::vector<base::FilePath>& entry_paths) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
   auto launch_info = std::make_unique<app_restore::AppLaunchInfo>(
       app->id(), handler_id, entry_paths);
   full_restore::SaveAppLaunchInfo(context->GetPath(), std::move(launch_info));

apps/load_and_launch_browsertest.cc

@@ -17,7 +17,6 @@
 #include "base/test/test_timeouts.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "chrome/browser/apps/platform_apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/load_error_reporter.h"
@@ -40,10 +39,6 @@ namespace {
 
 constexpr char kTestExtensionId[] = "behllobkkfkfnphdnhnkndlbkcpglgmj";
 
-// Lacros doesn't support launching with chrome already running. See the header
-// comment for InProcessBrowserTest::GetCommandLineForRelaunch().
-#if !BUILDFLAG(IS_CHROMEOS_LACROS)
-
 const char* const kSwitchesToCopy[] = {
     sandbox::policy::switches::kNoSandbox,
     switches::kUserDataDir,
@@ -127,8 +122,6 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
   ASSERT_EQ(CHROME_RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code);
 }
 
-#endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
-
 // TestFixture that appends --load-and-launch-app with an app before calling
 // BrowserMain.
 class LoadAndLaunchPlatformAppBrowserTest : public PlatformAppBrowserTest {

apps/saved_files_service.cc

@@ -17,7 +17,7 @@
 #include "base/json/values_util.h"
 #include "base/memory/raw_ptr.h"
 #include "base/not_fatal_until.h"
-#include "build/chromeos_buildflags.h"
+#include "build/build_config.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/api/file_system/saved_file_entry.h"
 #include "extensions/browser/extension_host.h"
@@ -314,7 +314,7 @@ void SavedFilesService::SavedFiles::EnqueueFileEntry(const std::string& id) {
   SavedFileEntry* file_entry = id_it->second.get();
   int old_sequence_number = file_entry->sequence_number;
 
-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS)
   // crbug.com/983844 Convert path from legacy Download/ to MyFiles/Downloads/
   // so entries saved before MyFiles don't fail. TODO(lucmult): Remove this
   // after M-83.

apps/ui/views/BUILD.gn

@@ -16,7 +16,6 @@ source_set("views") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
   deps = [
-    "//build:chromeos_buildflags",
     "//cc/paint",
     "//chrome/app/theme:theme_resources",
     "//extensions/browser",

apps/ui/views/app_window_frame_view.cc

@@ -8,7 +8,6 @@
 #include <utility>
 
 #include "build/build_config.h"
-#include "build/chromeos_buildflags.h"
 #include "cc/paint/paint_flags.h"
 #include "chrome/grit/theme_resources.h"
 #include "extensions/browser/app_window/native_app_window.h"
@@ -147,9 +146,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() const {
 gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Rect window_bounds = client_bounds;
-// TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
+#if BUILDFLAG(IS_LINUX)
-// complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
   // Get the difference between the widget's client area bounds and window
   // bounds, and grow |window_bounds| by that amount.
   gfx::Insets native_frame_insets =