Work on Windows GN tests

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/1101323003

Cr-Commit-Position: refs/heads/master@{#326889}

BUILD.gn

@@ -766,6 +766,7 @@ 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/test:browser_tests",
       "//chrome/test:interactive_ui_tests",
       "//chrome/test:sync_integration_tests",  # Note: need to turn off incremental linking for debug.
@@ -816,8 +817,8 @@ if (is_linux) {
       "//ui/gfx:gfx_unittests",  # PASSES (with assertion failure?) 4/20/2015
       "//ui/message_center:message_center_unittests",  # PASSES 4/20/2015
       "//ui/touch_selection:ui_touch_selection_unittests",  # PASSES 4/20/2015
-      "//ui/views:views_unittests",  # Same as WM unittests
-      "//ui/wm:wm_unittests",  # CRASHES, looks like something simple missing.
+      "//ui/views:views_unittests",  # TooltipControllerTest failures
+      "//ui/wm:wm_unittests",  # PASSES 4/21/2015
       "//url:url_unittests",  # PASSES 4/17/2015
 
       # TODO(GYP) installer_util_unittests

chrome/app_installer/BUILD.gn

+# 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("app_installer") {
+  sources = [
+    "/win/app_installer_main.cc"
+  ]
+
+  configs -= [ "//build/config/win:console" ]
+  configs += [ "//build/config/win:windowed" ]
+
+  deps = [
+    ":util",
+    "//base",
+  ]
+
+  # TODO(GYP) manifest.
+}
+
+source_set("util") {
+  sources = [
+    "win/app_installer_util.cc",
+    "win/app_installer_util.h",
+  ]
+
+  deps = [
+    "//base",
+    "//chrome/common",
+    "//chrome/common:constants",
+    "//chrome/installer/launcher_support",
+    "//chrome/installer/util",
+    "//chrome/installer/util:strings",
+    "//content/public/common",
+    "//net",
+    "//third_party/omaha:extractor",
+  ]
+}
+
+test("app_installer_unittests") {
+  sources = [
+    "win/app_installer_util_unittest.cc",
+  ]
+
+  deps = [
+    ":util",
+    "//base",
+    "//base/test:run_all_unittests",
+    "//net:test_support",
+    "//testing/gtest",
+  ]
+
+  # TODO(GYP) manifest
+}

chrome/app_installer/app_installer.gypi

@@ -7,6 +7,7 @@
     ['OS=="win"', {
       'targets': [
         {
+          # GN version: //chrome/app_installer:util
           'target_name': 'app_installer_util',
           'type': 'static_library',
           'dependencies': [
@@ -32,6 +33,7 @@
         # TODO(jackhou): Add a version resource (using
         # version_resource_rules.gypi).
         {
+          # GN version: //chrome/app_installer
           'target_name': 'app_installer',
           'type': 'executable',
           'dependencies': [
@@ -57,6 +59,7 @@
           },
         },
         {
+          # GN version: //chrome/installer/app_installer:app_installer_unittests
           'target_name': 'app_installer_unittests',
           'type': 'executable',
           'dependencies': [

chrome/chrome_installer.gypi

@@ -185,6 +185,7 @@
           },
         },
         {
+          # GN version: //chrome/installer/launcher_support
           'target_name': 'launcher_support',
           'type': 'static_library',
           'include_dirs': [

chrome/chrome_installer_util.gypi

@@ -107,6 +107,7 @@
     ['OS=="win"', {
       'targets': [
         {
+          # GN version: //chrome/installer/util
           'target_name': 'installer_util',
           'type': 'static_library',
           'variables': {

chrome/installer/launcher_support/BUILD.gn

+# 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.
+
+source_set("launcher_support") {
+  sources = [
+    "chrome_launcher_support.cc",
+    "chrome_launcher_support.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}

extensions/common/BUILD.gn

@@ -26,7 +26,10 @@ if (enable_extensions) {
   }
 
   # GYP version: extensions/extensions.gyp:extensions_common
-  source_set("common") {
+  # This must be a static library because extensions common depends on
+  # GetTrustedICAPublicKey in extensions/browser which isn't always linked
+  # in. TODO(brettw): This reverse dependency should be fixed.
+  static_library("common") {
     sources = rebase_path(extensions_gypi_values.extensions_common_sources,
                           ".",
                           "//extensions")
@@ -63,17 +66,16 @@ if (enable_extensions) {
     ]
 
     if (use_openssl) {
-      ssl_sources =
+      sources +=
           rebase_path(extensions_gypi_values.extensions_common_sources_openssl,
                       ".",
                       "//extensions")
-      sources += ssl_sources
+      deps += [ "//third_party/boringssl" ]
     } else {
-      nonssl_sources = rebase_path(
+      sources += rebase_path(
               extensions_gypi_values.extensions_common_sources_nonopenssl,
               ".",
               "//extensions")
-      sources += nonssl_sources
     }
 
     if (enable_nacl) {

third_party/omaha/BUILD.gn

+# 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.
+
+source_set("extractor") {
+  sources = [
+    "src/omaha/base/extractor.cc",
+    "src/omaha/base/extractor.h",
+  ]
+
+  include_dirs = [ "src" ]
+}

third_party/omaha/omaha.gyp

@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //third_party/omaha:extractor
       'target_name': 'omaha_extractor',
       'type': 'static_library',
       'sources': [