cleanup build files around mash

Removes build files and json files no longer needed.

BUG=763529
TEST=none

Change-Id: I2926af9e461e1178ec63b0f0c1e1368d4dc26d51
Reviewed-on: https://chromium-review.googlesource.com/701258
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506924}

chrome/BUILD.gn

@@ -73,22 +73,6 @@ if (is_win) {
   }
 }
 
-# Dependencies which must accompany ChromeMainDelegate when embedded
-# Mash services are enabled.
-if (enable_package_mash_services) {
-  embedded_mash_service_deps = [
-    "//chrome/app/mash:chrome_mash_catalog",
-    "//chrome/app/mash:embedded_services",
-    "//mash/common",
-    "//mash/quick_launch/public/interfaces:constants",
-    "//services/ui/public/interfaces:constants",
-  ]
-
-  if (is_chromeos) {
-    embedded_mash_service_deps += [ "//chrome/app/mash:chrome_mus_catalog" ]
-  }
-}
-
 # This target exists above chrome and it's main components in the dependency
 # tree as a central place to put assert_no_deps annotations. Since this depends
 # on Chrome and the main DLLs it uses, it will transitively assert that those
@@ -296,10 +280,6 @@ if (!is_android && !is_mac) {
             "//build/config/linux:xext",
           ]
         }
-
-        if (enable_package_mash_services) {
-          deps += embedded_mash_service_deps
-        }
       }
 
       # These files are used by the installer so we need a public dep.
@@ -334,24 +314,6 @@ if (!is_android && !is_mac) {
       sources += [ "app/chrome_exe_main_aura.cc" ]
     }
   }
-
-  if (enable_package_mash_services) {
-    chrome_binary("chrome_test") {
-      # Note that the output name needs to end with "chrome", because that's what
-      # telemetry test-runner expects.
-      output_name = "test_chrome"
-      sources = []
-      deps = [
-        "//chrome/app/mash:chrome_test_catalog",
-      ]
-      data = [
-        "$root_out_dir/chrome_200_percent.pak",
-      ]
-      if (!is_win && use_aura) {
-        sources += [ "app/chrome_test_exe_main_aura.cc" ]
-      }
-    }
-  }
 }  # !is_android && !is_mac
 
 if (is_win) {
@@ -453,10 +415,6 @@ if (is_win) {
       ]
     }
 
-    if (enable_package_mash_services) {
-      deps += embedded_mash_service_deps
-    }
-
     if (is_clang && is_official_build && !use_lld) {
       orderfile = "build/chrome.$target_cpu.orderfile"
       rebased_orderfile = rebase_path(orderfile, root_build_dir)
@@ -1200,10 +1158,6 @@ if (is_win) {
       "-ObjC",
     ]
 
-    if (enable_package_mash_services) {
-      deps += embedded_mash_service_deps
-    }
-
     configs += [ "//build/config/compiler:wexit_time_destructors" ]
   }
 

chrome/app/BUILD.gn

@@ -18,8 +18,7 @@ source_set("command_ids") {
   ]
 }
 
-# Shared by //chrome/browser and //chrome/app/mash. Not in //chrome/common
-# because it isn't shared with processes like renderer, utility, etc.
+# TODO: put back in chrome/browser if necessary. http://crbug.com/771801.
 source_set("shutdown_signal_handlers") {
   sources = [
     "shutdown_signal_handlers_posix.cc",
@@ -372,17 +371,10 @@ static_library("test_support") {
 
   if (enable_package_mash_services) {
     deps += [
-      "//chrome/app/mash:chrome_mash_catalog",
-      "//chrome/app/mash:chrome_test_catalog",
-      "//chrome/app/mash:embedded_services",
       "//mash/common",
       "//mash/quick_launch/public/interfaces:constants",
       "//services/ui/public/interfaces:constants",
     ]
-
-    if (is_chromeos) {
-      deps += [ "//chrome/app/mash:chrome_mus_catalog" ]
-    }
   }
 }
 

chrome/app/chrome_main_delegate.cc

@@ -190,9 +190,6 @@ const size_t ChromeMainDelegate::kNonWildcardDomainNonPortSchemesSize =
 
 namespace {
 
-base::LazyInstance<ChromeMainDelegate::ServiceCatalogFactory>::Leaky
-    g_service_catalog_factory = LAZY_INSTANCE_INITIALIZER;
-
 #if defined(OS_WIN)
 // Early versions of Chrome incorrectly registered a chromehtml: URL handler,
 // which gives us nothing but trouble. Avoid launching chrome this way since
@@ -513,12 +510,6 @@ ChromeMainDelegate::ChromeMainDelegate(base::TimeTicks exe_entry_point_ticks) {
 ChromeMainDelegate::~ChromeMainDelegate() {
 }
 
-// static
-void ChromeMainDelegate::InstallServiceCatalogFactory(
-    ServiceCatalogFactory factory) {
-  g_service_catalog_factory.Get() = std::move(factory);
-}
-
 bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesRecorder::Get()->SaveChromeMainStats();

chrome/app/chrome_main_delegate.h

@@ -31,10 +31,6 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
   explicit ChromeMainDelegate(base::TimeTicks exe_entry_point_ticks);
   ~ChromeMainDelegate() override;
 
-  using ServiceCatalogFactory =
-      base::RepeatingCallback<std::unique_ptr<base::Value>(void)>;
-  static void InstallServiceCatalogFactory(ServiceCatalogFactory factory);
-
  protected:
   // content::ContentMainDelegate implementation:
   bool BasicStartupComplete(int* exit_code) override;

chrome/app/chrome_test_exe_main_aura.cc

-// Copyright 2017 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.
-
-#include "build/build_config.h"
-#include "chrome/app/chrome_main_delegate.h"
-#include "chrome/app/mash/chrome_test_catalog.h"
-
-extern "C" {
-int ChromeMain(int argc, const char** argv);
-}
-
-int main(int argc, const char** argv) {
-  ChromeMainDelegate::InstallServiceCatalogFactory(
-      base::Bind(&CreateChromeTestCatalog));
-  return ChromeMain(argc, argv);
-}

chrome/app/mash/BUILD.gn

-# Copyright 2016 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("//build/config/nacl/config.gni")
-import("//chrome/common/features.gni")
-import("//components/nacl/features.gni")
-import("//services/catalog/public/tools/catalog.gni")
-import("//services/service_manager/public/service_manifest.gni")
-
-assert(enable_package_mash_services)
-
-# TODO(sky): clean this and catalog entries up.
-group("embedded_services") {
-  deps = [
-    ":chrome_mash_catalog",
-    "//base:i18n",
-    "//chrome/common:constants",
-    "//components/tracing:startup_tracing",
-    "//content/public/browser",
-    "//content/public/common",
-    "//mash/catalog_viewer:lib",
-    "//mash/catalog_viewer/public/interfaces:constants",
-    "//mash/common",
-    "//mash/quick_launch:lib",
-    "//mash/quick_launch/public/interfaces:constants",
-    "//mash/session:lib",
-    "//mash/session/public/interfaces:constants",
-    "//mash/task_viewer:lib",
-    "//mash/task_viewer/public/interfaces:constants",
-    "//services/catalog/public/interfaces",
-    "//services/service_manager",
-    "//services/service_manager/background:lib",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp/standalone_service",
-    "//services/service_manager/public/interfaces",
-    "//services/service_manager/runner:init",
-    "//services/service_manager/runner/common",
-    "//services/service_manager/runner/host:lib",
-    "//services/service_manager/standalone",
-    "//services/ui:lib",
-    "//services/ui/ime/test_ime_driver:lib",
-    "//services/ui/public/interfaces:constants",
-    "//url",
-  ]
-
-  if (is_chromeos) {
-    deps += [
-      ":chrome_mus_catalog",
-      "//ash/autoclick/mus:lib",
-      "//ash/mus:lib",
-      "//ash/resources",
-      "//ash/touch_hud/mus:lib",
-    ]
-  }
-
-  if (is_posix) {
-    deps += [ "//chrome/app:shutdown_signal_handlers" ]
-  }
-
-  if (is_linux && !is_android) {
-    deps += [
-      "//components/font_service:lib",
-      "//components/font_service/public/interfaces",
-    ]
-  }
-}
-
-catalog("catalog_common") {
-  embedded_services = [
-    "//ash/autoclick/mus:manifest",
-    "//ash/touch_hud/mus:manifest",
-    "//mash/catalog_viewer:manifest",
-    "//mash/quick_launch:manifest",
-    "//mash/session:manifest",
-    "//mash/task_viewer:manifest",
-    "//services/ui:manifest",
-    "//services/ui/ime/test_ime_driver:manifest",
-  ]
-  standalone_services = [
-    "//mash/example/views_examples:manifest",
-    "//mash/simple_wm:manifest",
-  ]
-
-  if (is_chromeos) {
-    embedded_services += [ "//ash/mus:manifest" ]
-  }
-
-  if (is_linux && !is_android) {
-    embedded_services += [ "//components/font_service:manifest" ]
-  }
-
-  if (enable_nacl && is_chromeos) {
-    embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
-  }
-}
-
-catalog("catalog") {
-  catalog_deps = [
-    ":catalog_common",
-    "//chrome/app:catalog_for_mash",
-  ]
-}
-
-catalog_cpp_source("chrome_mash_catalog") {
-  catalog = ":catalog"
-  generated_function_name = "CreateChromeMashCatalog"
-}
-
-catalog("catalog_test") {
-  catalog_deps = [
-    ":catalog_common",
-    "//chrome/app:catalog_for_tests_mash",
-  ]
-}
-
-catalog_cpp_source("chrome_test_catalog") {
-  catalog = ":catalog_test"
-  generated_function_name = "CreateChromeTestCatalog"
-}
-
-if (is_chromeos) {
-  catalog("catalog_mus") {
-    catalog_deps = [ "//chrome/app:catalog" ]
-    embedded_services = [
-      # TODO(sky): verify if we need this.
-      "//services/ui/ime/test_ime_driver:manifest",
-    ]
-
-    if (enable_nacl) {
-      embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
-    }
-  }
-
-  catalog_cpp_source("chrome_mus_catalog") {
-    catalog = ":catalog_mus"
-    generated_function_name = "CreateChromeMusCatalog"
-  }
-}

chrome/app/mash/DEPS

-include_rules = [
-  "+ash",
-  # This code is purely a packaging convenience and should be no different
-  # than running mojo_runner with mash_session. As such, this code should not
-  # depend upon chrome code in any way.
-  "-chrome",
-  "+chrome/app/mash",
-  "+chrome/app/shutdown_signal_handlers_posix.h",
-  "+chrome/common/chrome_switches.h",
-  "+components/font_service",
-  "+components/tracing",
-  "+content/public",
-  "+services/ui",
-  "+mash",
-  "+mojo/edk/embedder",
-  "+services/catalog",
-  "+services/service_manager",
-]

chrome/app/mash/OWNERS

-rockot@chromium.org
-sky@chromium.org
-
-per-file *.json=mfomitchev@chromium.org

chrome/app/mash/mash_service_overrides.json

-{
-  "content_browser": {
-    "executable_path": "@EXE_DIR/chrome",
-    "package_name": "chrome_content_browser"
-  },
-  "content_gpu": {
-    "package_name": "chrome_content_gpu"
-  },
-  "content_plugin": {
-    "package_name": "chrome_content_plugin"
-  },
-  "content_renderer": {
-    "package_name": "chrome_content_renderer"
-  },
-  "content_utility": {
-    "package_name": "chrome_content_utility"
-  }
-}

chrome/browser/ui/BUILD.gn

@@ -3353,6 +3353,7 @@ split_static_library("ui") {
         "ash/launcher/launcher_arc_app_updater.h",
         "views/arc_app_dialog_view.cc",
       ]
+      deps += [ "//mash/common" ]
     }
   } else {
     sources += [

chrome/test/BUILD.gn

@@ -1019,13 +1019,6 @@ if (!is_android) {
       "//testing/xvfb.py",
       "//testing/scripts/run_telemetry_as_googletest.py",
     ]
-
-    if (enable_package_mash_services) {
-      deps += [ "//chrome:chrome_test" ]
-      data_deps = [
-        "//chrome:chrome_test",
-      ]
-    }
   }
 
   group("telemetry_gpu_unittests_run") {
@@ -1078,12 +1071,6 @@ static_library("browser_tests_runner") {
       "base/mash_browser_tests_main.cc",
       "base/mash_browser_tests_main.h",
     ]
-
-    deps += [
-      "//chrome/app/mash:embedded_services",
-      "//mash/session/public/interfaces:constants",
-      "//services/service_manager/background:lib",
-    ]
   } else {
     sources += [ "base/browser_tests_main.cc" ]
   }
@@ -1149,6 +1136,8 @@ test("browser_tests") {
 
     data_deps += [
       # Needed for --run-in-mash, which triggers launching chrome.
+      # TODO(sky): this seems wrong, figure a better way to get resources.
+      "//ash/mus:resources",
       "//chrome",
       "//ui/keyboard:resources",
     ]
@@ -2966,13 +2955,6 @@ group("telemetry_perf_unittests") {
     # For smoke testing run_multiple_telemetry_benchmarks_as_googletest
     "//testing/scripts/run_multiple_telemetry_benchmarks_as_googletest.py",
   ]
-
-  if (enable_package_mash_services) {
-    deps += [ "//chrome:chrome_test" ]
-    data_deps = [
-      "//chrome:chrome_test",
-    ]
-  }
 }
 
 group("telemetry_perf_tests") {