Add installer_util_unittests to the GN windows build

This fixes some C++ Warnings on Windows to avoid having to add suppressions to the GN build. Moves the generated strings header to the same place in the gen tree as it is in the source tree. Update includes. CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1062743006 Cr-Commit-Position: refs/heads/master@{#327790}
marcosholgado · Apr 30, 2015 · cb55755 · cb55755
1 parent 5ba4490
commit cb55755
Show file tree

Hide file tree

Showing 26 changed files with 194 additions and 54 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -788,13 +788,14 @@ if (is_linux) {
       "//base:base_unittests",  # PASSES 4/20/2015
       "//cc:cc_unittests",  # PASSES 4/17/2015
       "//chrome_elf:chrome_elf_unittests",  # FAILS 4/20/2015
-      "//chrome/app_installer:app_installer_unittests",
+      "//chrome/app_installer:app_installer_unittests",  # PASSES 4/24/2015
+      "//chrome/installer/util:installer_util_unittests",
       "//chrome/test:browser_tests",
       "//chrome/test:interactive_ui_tests",
       "//chrome/test:sync_integration_tests",  # Note: need to turn off incremental linking for debug.
       "//chrome/test:unit_tests",
       "//chrome/test/chromedriver:chromedriver_unittests",  # PASSES 4/20/2015
-      "//components:components_browsertests",
+      "//components:components_browsertests",  # PASSES 4/24/2015
       "//components:components_unittests",  # PASSES 4/17/2015
       "//courgette:courgette_unittests",  # PASSES 4/20/2015
       "//content/test:content_browsertests",
@@ -843,8 +844,6 @@ if (is_linux) {
       "//ui/wm:wm_unittests",  # PASSES 4/21/2015
       "//url:url_unittests",  # PASSES 4/17/2015
 
-      # TODO(GYP) installer_util_unittests
-      # TODO(GYP) app_installer_unittests
       # TODO(GYP) nacl_integration
       # TODO(GYP) telemetry_perf_unittests
       # TODO(GYP) telemetry_unittests

diff --git a/chrome/app_installer/BUILD.gn b/chrome/app_installer/BUILD.gn
@@ -8,7 +8,7 @@ assert(is_win)
 
 executable("app_installer") {
   sources = [
-    "/win/app_installer_main.cc"
+    "win/app_installer_main.cc",
   ]
 
   configs -= [ "//build/config/win:console" ]

diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
@@ -50,6 +50,7 @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
+#include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/browser/browser_thread.h"
@@ -58,7 +59,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/dwrite_font_platform_win.h"
 #include "content/public/common/main_function_params.h"
-#include "installer_util_strings/installer_util_strings.h"
 #include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -402,6 +402,7 @@
           ],
         },
         {
+          # GN version: //chrome:chrome_version_resources
           'target_name': 'chrome_version_resources',
           'type': 'none',
           'variables': {

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
@@ -76,6 +76,7 @@
           ],
         },
         {
+          # GN version: //chrome/installer/util:installer_util_unittests
           'target_name': 'installer_util_unittests',
           'type': 'executable',
           'dependencies': [
@@ -94,6 +95,7 @@
             '..',
           ],
           'sources': [
+            # List duplicated in GN build.
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
@@ -160,27 +162,28 @@
               'variables': {
                 'create_string_rc_py': 'installer/util/prebuild/create_string_rc.py',
                 'brand_strings': '<(branding_path_component)_strings',
+                'gen_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util',
               },
 
               'inputs': [
                 '<(create_string_rc_py)',
                 'app/<(brand_strings).grd',
               ],
               'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
-                '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+                '<(gen_dir)/installer_util_strings.h',
+                '<(gen_dir)/installer_util_strings.rc',
               ],
               'action': ['python',
                          '<(create_string_rc_py)',
                          '-i', 'app/<(brand_strings).grd:resources',
                          '-n', 'installer_util_strings',
-                         '-o', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',],
+                         '-o', '<(gen_dir)',],
               'message': 'Generating installer_util_strings',
             },
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
+              '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
         },
@@ -228,7 +231,7 @@
             ],
           },
           'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
             'installer/mini_installer/chrome.release',
             'installer/setup/app_launcher_installer.cc',
             'installer/setup/app_launcher_installer.h',

diff --git a/chrome/installer/setup/app_launcher_installer.cc b/chrome/installer/setup/app_launcher_installer.cc
@@ -13,14 +13,13 @@
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_state.h"
+#include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/product.h"
 #include "chrome/installer/util/updating_app_registration_data.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 
-#include "installer_util_strings.h"  // NOLINT
-
 namespace installer {
 
 namespace {

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
@@ -56,6 +56,7 @@
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/installation_validator.h"
 #include "chrome/installer/util/installer_state.h"
+#include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/logging_installer.h"
 #include "chrome/installer/util/lzma_util.h"
@@ -65,8 +66,6 @@
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/user_experiment.h"
 
-#include "installer_util_strings.h"  // NOLINT
-
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/installer/util/updating_app_registration_data.h"
 #endif

diff --git a/chrome/installer/setup/setup_unittests.rc b/chrome/installer/setup/setup_unittests.rc
@@ -55,7 +55,7 @@ END
 //
 // String Table
 //
-#include "installer_util_strings.rc"
+#include "chrome/installer/util/installer_util_strings.rc"
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////

diff --git a/chrome/installer/test/BUILD.gn b/chrome/installer/test/BUILD.gn
@@ -0,0 +1,60 @@
+# Copyright 2015 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("//testing/test.gni")
+
+assert(is_win)
+
+executable("alternate_version_generator") {
+  testonly = true
+  sources = [
+    "alternate_version_generator_main.cc",
+  ]
+
+  deps = [
+    ":alternate_version_generator_lib",
+    "//base",
+    "//base/test:test_support",
+    "//chrome/common:constants",
+    "//chrome/installer/util",
+    "//testing/gtest",
+  ]
+}
+
+source_set("alternate_version_generator_lib") {
+  testonly = true
+  sources = [
+    "alternate_version_generator.cc",
+    "alternate_version_generator.h",
+    "pe_image_resources.cc",
+    "pe_image_resources.h",
+    "resource_loader.cc",
+    "resource_loader.h",
+    "resource_updater.cc",
+    "resource_updater.h",
+  ]
+  deps = [
+    "//base",
+    "//chrome/installer/util",
+    "//chrome/common:constants",
+  ]
+}
+
+test("upgrade_test") {
+  sources = [
+    "run_all_tests.cc",
+    "upgrade_test.cc",
+  ]
+  deps = [
+    ":alternate_version_generator_lib",
+    "//base",
+    "//base/test:test_support",
+    "//chrome/common:constants",
+    "//chrome/installer/util",
+    "//testing/gtest",
+  ]
+  data_deps = [
+    # 'mini_installer.gyp:mini_installer',  TODO(GYP)
+  ]
+}
diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc
@@ -226,7 +226,7 @@ bool RunProcessAndWait(const wchar_t* exe_path, const std::wstring& cmdline,
                      << cmdline << "\".";
         result = false;
       } else {
-        DCHECK_NE(*exit_code, STILL_ACTIVE);
+        DCHECK_NE(*exit_code, static_cast<int>(STILL_ACTIVE));
       }
     }
   } else {
@@ -547,7 +547,7 @@ bool GenerateAlternateVersion(const base::FilePath& original_installer_path,
         base::WriteFile(setup_ex_,
                         reinterpret_cast<const char*>(resource_data.first),
                         static_cast<int>(resource_data.second));
-    if (written != resource_data.second) {
+    if (written != static_cast<int>(resource_data.second)) {
       LOG(DFATAL) << "Failed writing \"" << setup_ex_.value() << "\"";
       return false;
     }
@@ -559,7 +559,7 @@ bool GenerateAlternateVersion(const base::FilePath& original_installer_path,
         base::WriteFile(chrome_packed_7z,
                         reinterpret_cast<const char*>(resource_data.first),
                         static_cast<int>(resource_data.second));
-    if (written != resource_data.second) {
+    if (written != static_cast<int>(resource_data.second)) {
       LOG(DFATAL) << "Failed writing \"" << chrome_packed_7z.value() << "\"";
       return false;
     }

diff --git a/chrome/installer/test/resource_updater.cc b/chrome/installer/test/resource_updater.cc
@@ -43,7 +43,8 @@ bool ResourceUpdater::Update(const std::wstring& name,
 
   if (input.Initialize(input_file)) {
     if (UpdateResource(handle_, type.c_str(), name.c_str(), language_id,
-                       const_cast<uint8*>(input.data()), input.length())
+                       const_cast<uint8*>(input.data()),
+                       static_cast<DWORD>(input.length()))
         != FALSE) {
       return true;
     }

diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
@@ -19,6 +19,7 @@
     ['OS=="win"', {
       'targets': [
         {
+          # GN version: //chrome/installer/test:alternate_version_generator_lib
           'target_name': 'alternate_version_generator_lib',
           'type': 'static_library',
           'dependencies': [
@@ -43,6 +44,7 @@
           'msvs_disabled_warnings': [4267, ],
         },
         {
+          # GN version: //chrome/installer/test:upgrade_test
           'target_name': 'upgrade_test',
           'type': 'executable',
           'dependencies': [
@@ -68,6 +70,7 @@
           ],
         },
         {
+          # GN version: //chrome/installer/test:alternate_version_generator
           'target_name': 'alternate_version_generator',
           'type': 'executable',
           'dependencies': [