WebApp: Get rid of web_applications/bookmark_apps/ directory.

Move all extension-based tests into web_applications/extensions/.

TBR=bsep@chromium.org

Bug: 973324
Change-Id: I3a2238ad37f9d540e2970e2d3a5bb4341f3e1ccb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724520
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682172}

chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc

@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/custom_tab_bar_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
-#include "chrome/browser/web_applications/bookmark_apps/system_web_app_manager_browsertest.h"
+#include "chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.h"
 #include "chrome/browser/web_applications/system_web_app_manager.h"
 #include "chrome/common/web_application_info.h"
 #include "chrome/test/base/in_process_browser_test.h"

chrome/browser/web_applications/BUILD.gn

@@ -194,7 +194,6 @@ source_set("unit_tests") {
   deps = [
     ":web_app_test_group",
     ":web_applications_unit_tests",
-    "//chrome/browser/web_applications/bookmark_apps:unit_tests",
     "//chrome/browser/web_applications/components:unit_tests",
     "//chrome/browser/web_applications/extensions:unit_tests",
   ]
@@ -205,7 +204,6 @@ source_set("browser_tests") {
 
   deps = [
     ":web_app_test_group",
-    "//chrome/browser/web_applications/bookmark_apps:browser_tests",
     "//chrome/browser/web_applications/components:browser_tests",
     "//chrome/browser/web_applications/extensions:browser_tests",
   ]

chrome/browser/web_applications/bookmark_apps/BUILD.gn

-# Copyright 2018 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.
-
-import("//extensions/buildflags/buildflags.gni")
-
-assert(enable_extensions)
-
-source_set("unit_tests") {
-  testonly = true
-
-  sources = [
-    "policy/web_app_policy_manager_unittest.cc",
-    "system_web_app_manager_unittest.cc",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome/browser",
-    "//chrome/browser/web_applications",
-    "//chrome/browser/web_applications:web_app_test_group",
-    "//chrome/browser/web_applications:web_applications_on_extensions",
-    "//chrome/browser/web_applications:web_applications_on_extensions_test_support",
-    "//chrome/browser/web_applications:web_applications_test_support",
-    "//chrome/browser/web_applications/components",
-    "//chrome/browser/web_applications/extensions",
-    "//chrome/common:constants",
-    "//chrome/test:test_support",
-    "//components/account_id",
-    "//components/crx_file:crx_file",
-    "//components/sync_preferences:test_support",
-    "//content/test:test_support",
-    "//extensions/common",
-    "//skia",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//url",
-  ]
-}
-
-source_set("browser_tests") {
-  testonly = true
-
-  defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-
-  sources = [
-    "system_web_app_manager_browsertest.cc",
-    "system_web_app_manager_browsertest.h",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//chrome/app/theme:chrome_unscaled_resources_grit",
-    "//chrome/browser/web_applications",
-    "//chrome/browser/web_applications:web_applications_on_extensions",
-    "//chrome/browser/web_applications:web_applications_on_extensions_test_support",
-    "//chrome/browser/web_applications:web_applications_test_support",
-    "//chrome/browser/web_applications/components",
-    "//chrome/browser/web_applications/extensions",
-    "//chrome/common:constants",
-    "//chrome/test:test_support",
-    "//chrome/test:test_support_ui",
-    "//extensions/browser",
-    "//url",
-  ]
-}

chrome/browser/web_applications/extensions/BUILD.gn

@@ -48,6 +48,8 @@ source_set("unit_tests") {
     "externally_installed_web_app_prefs_unittest.cc",
     "install_manager_bookmark_app_unittest.cc",
     "pending_bookmark_app_manager_unittest.cc",
+    "system_web_app_manager_unittest.cc",
+    "web_app_policy_manager_unittest.cc",
     "web_app_provider_unittest.cc",
   ]
 
@@ -79,6 +81,8 @@ source_set("browser_tests") {
     "bookmark_app_registrar_browsertest.cc",
     "install_manager_bookmark_app_browsertest.cc",
     "pending_bookmark_app_manager_browsertest.cc",
+    "system_web_app_manager_browsertest.cc",
+    "system_web_app_manager_browsertest.h",
     "web_app_audio_focus_browsertest.cc",
   ]
 
@@ -87,11 +91,13 @@ source_set("browser_tests") {
   deps = [
     ":extensions",
     "//base/test:test_support",
+    "//chrome/app/theme:chrome_unscaled_resources_grit",
     "//chrome/browser",
     "//chrome/browser/ui",
     "//chrome/browser/web_applications:web_app_test_group",
     "//chrome/browser/web_applications:web_applications_on_extensions",
     "//chrome/browser/web_applications:web_applications_on_extensions_test_support",
+    "//chrome/browser/web_applications:web_applications_test_support",
     "//chrome/browser/web_applications/components",
     "//chrome/test:test_support",
     "//chrome/test:test_support_ui",

chrome/browser/web_applications/bookmark_apps/system_web_app_manager_browsertest.cc → chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.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/web_applications/bookmark_apps/system_web_app_manager_browsertest.h"
+#include "chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.h"
 
 #include <vector>
 

chrome/browser/web_applications/bookmark_apps/system_web_app_manager_browsertest.h → chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.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_WEB_APPLICATIONS_BOOKMARK_APPS_SYSTEM_WEB_APP_MANAGER_BROWSERTEST_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_BOOKMARK_APPS_SYSTEM_WEB_APP_MANAGER_BROWSERTEST_H_
+#ifndef CHROME_BROWSER_WEB_APPLICATIONS_EXTENSIONS_SYSTEM_WEB_APP_MANAGER_BROWSERTEST_H_
+#define CHROME_BROWSER_WEB_APPLICATIONS_EXTENSIONS_SYSTEM_WEB_APP_MANAGER_BROWSERTEST_H_
 
 #include <memory>
 
@@ -42,4 +42,4 @@ class SystemWebAppManagerBrowserTest : public InProcessBrowserTest {
 
 }  // namespace web_app
 
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_BOOKMARK_APPS_SYSTEM_WEB_APP_MANAGER_BROWSERTEST_H_
+#endif  // CHROME_BROWSER_WEB_APPLICATIONS_EXTENSIONS_SYSTEM_WEB_APP_MANAGER_BROWSERTEST_H_