Updater: Refactor: Merge the Mac and Win versions of app_install.h

Bug: 1111498
Change-Id: I7e1919657e5760354da87f5bf95e2b55596cc30b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329945Reviewed-by: Sorin Jianu <sorin@chromium.org>
Commit-Queue: Mila Green <milagreen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793397}

chrome/updater/BUILD.gn

@@ -218,6 +218,50 @@ if (is_win || is_mac) {
     output = "$target_gen_dir/updater_version.h"
   }
 
+  # This build target is defined to minimize the impact of -Wno-missing-braces
+  # compiler switch. In the future it might be possible to isolate the
+  # dependency of ATL in the UI so ATL headers are not visible in the
+  # compilation units outside the UI itself.
+  # TODO(sorin): https://crbug.com/1014311
+  source_set("app_install") {
+    sources = [ "app/app_install.h" ]
+
+    if (is_mac) {
+      sources += [ "mac/setup/app_install.cc" ]
+    }
+
+    if (is_win) {
+      sources += [ "win/app_install.cc" ]
+    }
+
+    deps = [
+      ":lib",
+      "//base",
+      "//chrome/updater:base",
+      "//chrome/updater:version_header",
+    ]
+    if (is_mac) {
+      deps += [ "//chrome/updater/mac:updater_setup_sources" ]
+    }
+
+    if (is_win) {
+      deps += [
+        "//base:i18n",
+        "//chrome/updater/win:install_progress_observer",
+        "//chrome/updater/win:lib",
+        "//chrome/updater/win/ui",
+        "//components/prefs",
+        "//components/update_client",
+      ]
+    }
+
+    allow_circular_includes_from = [ ":lib" ]
+
+    if (is_win) {
+      cflags_cc = [ "-Wno-missing-braces" ]
+    }
+  }
+
   test("updater_tests") {
     testonly = true
 

chrome/updater/mac/setup/app_install.h → chrome/updater/app/app_install.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_UPDATER_MAC_SETUP_APP_INSTALL_H_
-#define CHROME_UPDATER_MAC_SETUP_APP_INSTALL_H_
+#ifndef CHROME_UPDATER_APP_APP_INSTALL_H_
+#define CHROME_UPDATER_APP_APP_INSTALL_H_
 
 #include "base/memory/scoped_refptr.h"
 
@@ -15,4 +15,4 @@ scoped_refptr<App> MakeAppInstall();
 
 }  // namespace updater
 
-#endif  // CHROME_UPDATER_MAC_SETUP_APP_INSTALL_H_
+#endif  // CHROME_UPDATER_APP_APP_INSTALL_H_

chrome/updater/mac/BUILD.gn

@@ -9,10 +9,10 @@ import("//chrome/updater/branding.gni")
 
 group("mac") {
   deps = [
-    ":app_install",
     ":browser_install_script",
     ":updater_bundle",
     ":updater_install_script",
+    "//chrome/updater:app_install",
     "//chrome/updater/mac/signing",
   ]
 }
@@ -59,9 +59,9 @@ mac_app_bundle("updater_bundle") {
 
   sources = [ "main.cc" ]
   deps = [
-    ":app_install",
     ":network_fetcher_sources",
     ":updater_setup_sources",
+    "//chrome/updater:app_install",
     "//chrome/updater:lib",
   ]
 }
@@ -106,23 +106,6 @@ source_set("updater_setup_sources") {
   ]
 }
 
-source_set("app_install") {
-  sources = [
-    "setup/app_install.cc",
-    "setup/app_install.h",
-  ]
-
-  deps = [
-    ":updater_setup_sources",
-    "//base",
-    "//chrome/updater:base",
-    "//chrome/updater:lib",
-    "//chrome/updater:version_header",
-  ]
-
-  allow_circular_includes_from = [ "//chrome/updater:lib" ]
-}
-
 action("updater_install_script") {
   script = "embed_variables.py"
 
@@ -181,12 +164,12 @@ source_set("updater_setup_tests") {
   data = [ "//chrome/test/data/updater/updater_setup_test_dmg.dmg" ]
 
   deps = [
-    ":app_install",
     ":installer_sources",
     ":updater_setup_sources",
     "//base",
     "//base/test:test_support",
     "//chrome/common:constants",
+    "//chrome/updater:app_install",
     "//testing/gtest",
   ]
 }

chrome/updater/mac/setup/app_install.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/updater/mac/setup/app_install.h"
+#include "chrome/updater/app/app_install.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"

chrome/updater/updater.cc

@@ -12,6 +12,7 @@
 #include "base/task/single_thread_task_executor.h"
 #include "build/build_config.h"
 #include "chrome/updater/app/app.h"
+#include "chrome/updater/app/app_install.h"
 #include "chrome/updater/app/app_uninstall.h"
 #include "chrome/updater/app/app_wake.h"
 #include "chrome/updater/configurator.h"
@@ -25,12 +26,10 @@
 #if defined(OS_WIN)
 #include "chrome/updater/app/server/win/server.h"
 #include "chrome/updater/app/server/win/service_main.h"
-#include "chrome/updater/win/app_install.h"
 #endif
 
 #if defined(OS_MAC)
 #include "chrome/updater/app/server/mac/server.h"
-#include "chrome/updater/mac/setup/app_install.h"
 #endif
 
 // Instructions For Windows.

chrome/updater/win/BUILD.gn

@@ -25,10 +25,10 @@ executable("updater") {
   configs += [ "//build/config/win:windowed" ]
 
   deps = [
-    ":app_install",
     ":lib",
     ":version_resources",
     "//build/win:default_exe_manifest",
+    "//chrome/updater:app_install",
     "//chrome/updater:lib",
     "//chrome/updater/win/ui:ui_resources",
   ]
@@ -134,34 +134,6 @@ source_set("install_progress_observer") {
   deps = [ "//base" ]
 }
 
-# This build target is defined to minimize the impact of -Wno-missing-braces
-# compiler switch. In the future it might be possible to isolate the
-# dependency of ATL in the UI so ATL headers are not visible in the
-# compilation units outside the UI itself.
-# TODO(sorin): https://crbug.com/1014311
-source_set("app_install") {
-  sources = [
-    "app_install.cc",
-    "app_install.h",
-  ]
-
-  deps = [
-    ":install_progress_observer",
-    ":lib",
-    "//base",
-    "//base:i18n",
-    "//chrome/updater:base",
-    "//chrome/updater:lib",
-    "//chrome/updater:version_header",
-    "//chrome/updater/win/ui",
-    "//components/prefs",
-    "//components/update_client",
-  ]
-  allow_circular_includes_from = [ "//chrome/updater:lib" ]
-
-  cflags_cc = [ "-Wno-missing-braces" ]
-}
-
 source_set("updater_tests") {
   testonly = true
 
@@ -175,11 +147,11 @@ source_set("updater_tests") {
   ]
 
   deps = [
-    ":app_install",
     ":constants",
     ":lib",
     ":tag_extractor",
     "//base/test:test_support",
+    "//chrome/updater:app_install",
     "//testing/gtest",
     "//url:url",
   ]
@@ -209,10 +181,10 @@ test("updater_unittests") {
   ]
 
   deps = [
-    ":app_install",
     ":lib",
     "//base",
     "//base/test:test_support",
+    "//chrome/updater:app_install",
     "//chrome/updater:version_header",
     "//chrome/updater/win/test:test_executables",
     "//chrome/updater/win/test:test_strings",

chrome/updater/win/app_install.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/updater/win/app_install.h"
+#include "chrome/updater/app/app_install.h"
 
 #include <memory>
 #include <string>

chrome/updater/win/app_install.h

-// Copyright 2019 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.
-
-#ifndef CHROME_UPDATER_WIN_APP_INSTALL_H_
-#define CHROME_UPDATER_WIN_APP_INSTALL_H_
-
-#include <string>
-
-#include "base/memory/scoped_refptr.h"
-
-namespace updater {
-
-class App;
-
-scoped_refptr<App> MakeAppInstall();
-
-}  // namespace updater
-
-#endif  // CHROME_UPDATER_WIN_APP_INSTALL_H_

chrome/updater/win/test/BUILD.gn

@@ -25,8 +25,8 @@ source_set("test_common") {
 
   deps = [
     "//base",
+    "//chrome/updater:app_install",
     "//chrome/updater:base",
-    "//chrome/updater/win:app_install",
     "//chrome/updater/win:lib",
   ]
 }