Revert of Add cloud_print to the GN build. (patchset #1 id:1 of https://codereview.chromium.org/1397433004/ )

Reason for revert:
Causes compile failures:
http://build.chromium.org/p/chromium/builders/Win/builds/36509/steps/compile/logs/stdio

ninja:error: 'gen/cloud_print/service_resources_en.rc', needed by 'obj/cloud_print/service/win/gen/cloud_print/cloud_print_service.service_resources_en.res', missing and no known rule to make it

Original issue's description:
> Add cloud_print to the GN build.
>
> There were some existing cloud_print targets that were hooked up only on Linux, but most of the code was Windows-only. This adds the missing targets and should bring us up to GYP parity.
>
> Fix the cloud print size_t to int warnings and remove the warning disable from GYP.
>
> Move generated resources file from cloud_print/resources.h to cloud_print/service/resources.h to match where the source file is.
>
> Cloud print does some messy things to get the content switches constants, including the file directly in its sources and manually setting LINK_CONTENT_STATICALLY for all targets. In GN, this adds a static_switches target in content that does this in an official way.
>
> Reland of https://codereview.chromium.org/1393123003/ with warning fixes
> TBR=dpranke
>
> Committed: https://crrev.com/70d2f990df7755c6e76aa20f156ff1f92a25f318
> Cr-Commit-Position: refs/heads/master@{#354089}

TBR=dpranke@google.com,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1409563002

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

21 files changed, 36 insertions, 432 deletions

diff --git a/cloud_print/BUILD.gn b/cloud_print/BUILD.gn
index d92c3b2..2cd785b 100644
--- a/cloud_print/BUILD.gn
+++ b/cloud_print/BUILD.gn
@@ -4,25 +4,6 @@
 
 import("//testing/test.gni")
 
-group("cloud_print") {
-  if (is_win) {
-    public_deps = [
-      "//cloud_print/service/win:cloud_print_service",
-      "//cloud_print/service/win:cloud_print_service_config",
-      "//cloud_print/service/win:cloud_print_service_setup",
-      "//cloud_print/virtual_driver/win/install:virtual_driver_setup",
-      "//cloud_print/virtual_driver/win/port_monitor",
-    ]
-
-    # When compiling 32-bit, also reference the 64-bit driver for installing on
-    # 64-bit systems.
-    if (target_cpu == "x86" && current_cpu == "x86") {
-      # TODO(brettw) enable this when Windows cross-compiles are set up.
-      # public_deps += [ "//cloud_print/virtual_driver/win/port_monitor(//build/toolchain/win:x64)" ]
-    }
-  }
-}
-
 test("cloud_print_unittests") {
   sources = [
     "service/service_state_unittest.cc",
@@ -31,17 +12,18 @@ test("cloud_print_unittests") {
   deps = [
     "//base",
     "//base/test:run_all_unittests",
-    "//cloud_print/service:lib",
+    "//cloud_print/service:cloud_print_service_lib",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
-  if (is_win) {
-    sources += [
-      "service/win/service_ipc_unittest.cc",
-      "virtual_driver/win/port_monitor/port_monitor_unittest.cc",
-    ]
-    deps += [ "//cloud_print/virtual_driver/win/port_monitor:lib" ]
-    libs = [ "secur32.lib" ]
-  }
+  # TODO(GYP)
+  # if (is_win) {
+  #  sources += [
+  #    "service/win/service_ipc_unittest.cc",
+  #    "virtual_driver/win/port_monitor/port_monitor_unittest.cc",
+  #  ]
+  #
+  #  deps += [ "virtual_driver/win:gcp_portmon_lib" ]
+  #}
 }
diff --git a/cloud_print/cloud_print.gyp b/cloud_print/cloud_print.gyp
index 8da7195..a677438 100644
--- a/cloud_print/cloud_print.gyp
+++ b/cloud_print/cloud_print.gyp
@@ -7,7 +7,6 @@
   },
   'targets': [
     {
-      # GN version: //cloud_print
       'target_name': 'cloud_print',
       'type': 'none',
       'dependencies': [
@@ -30,7 +29,6 @@
       ],
     },
     {
-      # GN version: //cloud_print:cloud_print_unittests
       'target_name': 'cloud_print_unittests',
       'type': 'executable',
       'sources': [
diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp
index 8ebd5cd..4057d23 100644
--- a/cloud_print/cloud_print_resources.gyp
+++ b/cloud_print/cloud_print_resources.gyp
@@ -17,9 +17,6 @@
   ],
   'targets': [
     {
-      # GN: Thes targets for this are split out depending on when the specific
-      # .ver file is used. For example, see:
-      # //cloud_print/sevice/win:exe_version
       'target_name': 'cloud_print_version_resources',
       'type': 'none',
       'variables': {
diff --git a/cloud_print/common/BUILD.gn b/cloud_print/common/BUILD.gn
deleted file mode 100644
index ca0b546..0000000
--- a/cloud_print/common/BUILD.gn
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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("common") {
-  sources = [
-    "win/cloud_print_utils.cc",
-    "win/cloud_print_utils.h",
-  ]
-
-  deps = [
-    "//base",
-  ]
-}
-
-source_set("install_utils") {
-  sources = [
-    "win/install_utils.cc",
-    "win/install_utils.h",
-  ]
-
-  deps = [
-    ":common",
-    "//base",
-  ]
-}
diff --git a/cloud_print/common/common.gyp b/cloud_print/common/common.gyp
index 13351fd..ea4efa3 100644
--- a/cloud_print/common/common.gyp
+++ b/cloud_print/common/common.gyp
@@ -7,7 +7,6 @@
   },
   'targets': [
     {
-      # GN version: //cloud_print/common:install_utils
       'target_name': 'cloud_print_install_lib',
       'type': 'static_library',
       'dependencies': [
diff --git a/cloud_print/service/BUILD.gn b/cloud_print/service/BUILD.gn
index 172a71e..7baf63b 100644
--- a/cloud_print/service/BUILD.gn
+++ b/cloud_print/service/BUILD.gn
@@ -2,34 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/features.gni")
 import("//tools/grit/grit_rule.gni")
 
-config("internal_config") {
-  defines = [
-    "SECURITY_WIN32",
-    "STRICT",
-    "_ATL_APARTMENT_THREADED",
-    "_ATL_CSTRING_EXPLICIT_CONSTRUCTORS",
-    "_ATL_NO_COM_SUPPORT",
-    "_ATL_NO_AUTOMATIC_NAMESPACE",
-    "_ATL_NO_EXCEPTIONS",
-  ]
-}
-
-if (is_win && is_clang) {
-  # service_controller.h uses DECLARE_REGISTRY_APPID_RESOURCEID, which
-  # in msvs2013 returns string literals via a non-const pointer. So
-  # disable this warning for now.
-  # TODO(thakis): Remove this once we're on 2014,
-  # https://connect.microsoft.com/VisualStudio/feedback/details/806376/atl-hindrances-to-adopting-new-strictstrings-conformance-option-in-vs2013
-  config("service_warning_config") {
-    cflags = [ "-Wno-writable-strings" ]
-  }
-}
-
-source_set("lib") {
+source_set("cloud_print_service_lib") {
   sources = [
+    "//cloud_print/common/win/cloud_print_utils.cc",
+    "//cloud_print/common/win/cloud_print_utils.h",
     "service_constants.cc",
     "service_constants.h",
     "service_state.cc",
@@ -50,46 +28,24 @@ source_set("lib") {
     "win/setup_listener.h",
   ]
 
-  configs += [
-    ":internal_config",
-    "//build/config/compiler:wexit_time_destructors",
-  ]
-
   deps = [
-    ":resources",
+    ":service_resources",
     "//base",
     "//base:base_static",
     "//base/third_party/dynamic_annotations",
-    "//chrome/common:constants",
-    "//cloud_print/common",
-    "//components/cloud_devices/common",
-    "//content/public/common:static_switches",
+    "//content/public/common",
     "//google_apis",
     "//ipc",
     "//net",
     "//url",
   ]
 
-  if (enable_basic_printing || enable_print_preview) {
-    deps += [ "//printing" ]
-  }
-
-  if (is_win) {
-    deps += [
-      "//chrome/common:constants",
-      "//chrome/installer/launcher_support",
-    ]
-  }
-
   if (is_clang) {
     cflags = [ "-Wno-parentheses" ]
-    if (is_win) {
-      public_configs = [ ":service_warning_config" ]
-    }
   }
 }
 
-grit("resources") {
+grit("service_resources") {
   source = "win/service_resources.grd"
   outputs = [
     "resources.h",
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index a6171a8..1eb2b23 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -22,14 +22,19 @@
       '_ATL_NO_AUTOMATIC_NAMESPACE',
       '_ATL_NO_EXCEPTIONS',
     ],
+    'conditions': [
+      ['OS=="win"', {
+        # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+        'msvs_disabled_warnings': [ 4267, ],
+      }],
+    ],
   },
   'targets': [
     {
-      # GN version: //cloud_print/service:resources
       'target_name': 'service_resources',
       'type': 'none',
       'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cloud_print/service',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cloud_print',
       },
       'actions': [
         {
@@ -43,7 +48,6 @@
       'includes': [ '../../build/grit_target.gypi' ],
     },
     {
-      # GN version: //cloud_print/service
       'target_name': 'cloud_print_service_lib',
       'type': 'static_library',
       'dependencies': [
diff --git a/cloud_print/service/win/BUILD.gn b/cloud_print/service/win/BUILD.gn
deleted file mode 100644
index f4a6f84..0000000
--- a/cloud_print/service/win/BUILD.gn
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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("//build/config/win/manifest.gni")
-import("//chrome/version.gni")
-
-assert(is_win)
-
-executable("cloud_print_service") {
-  sources = [
-    "cloud_print_service.cc",
-  ]
-
-  configs += [
-    "//build/config/compiler:wexit_time_destructors",
-    "//cloud_print/service:internal_config",
-  ]
-
-  deps = [
-    ":exe_manifest",
-    ":exe_version",
-    "//cloud_print/service:lib",
-  ]
-
-  libs = [ "secur32.lib" ]
-}
-
-windows_manifest("exe_manifest") {
-  sources = [
-    common_controls_manifest,
-    default_compatibility_manifest,
-    require_administrator_manifest,
-  ]
-  type = "exe"
-}
-
-process_version("exe_version") {
-  template_file = chrome_version_rc_template
-  sources = [
-    "cloud_print_service_exe.ver",
-  ]
-  output = "$target_gen_dir/cloud_print_service_exe_version.rc"
-}
-
-executable("cloud_print_service_config") {
-  sources = [
-    "cloud_print_service_config.cc",
-  ]
-
-  configs -= [ "//build/config/win:console" ]
-  configs += [ "//build/config/win:windowed" ]
-
-  deps = [
-    ":config_version",
-    ":exe_manifest",
-    "//cloud_print/common:install_utils",
-    "//cloud_print/service:resources",
-    "//cloud_print/service:lib",
-  ]
-
-  libs = [ "secur32.lib" ]
-
-  # TODO: Remove once cloud_print_service_config.cc no longer depends on
-  # atlapp.h, http://crbug.com/5027
-  if (is_clang) {
-    cflags = [
-      # atlapp.h contains a global "using namespace WTL;".
-      "-Wno-header-hygiene",
-
-      # atlgdi.h does an intentional assignment in an if conditional.
-      "-Wno-parentheses",
-
-      # atlgdi.h fails with -Wreorder enabled.
-      "-Wno-reorder",
-
-      # atlgdi.h doesn"t use braces around subobject initializers.
-      "-Wno-missing-braces",
-    ]
-  }
-}
-
-process_version("config_version") {
-  template_file = chrome_version_rc_template
-  sources = [
-    "cloud_print_service_config_exe.ver",
-  ]
-  output = "$target_gen_dir/cloud_print_service_config_version.rc"
-}
-
-executable("cloud_print_service_setup") {
-  sources = [
-    "installer.cc",
-    "installer.h",
-  ]
-
-  configs -= [ "//build/config/win:console" ]
-  configs += [ "//build/config/win:windowed" ]
-
-  deps = [
-    ":exe_manifest",
-    "//cloud_print/common:install_utils",
-    "//cloud_print/service:resources",
-    "//cloud_print/service:lib",
-  ]
-
-  libs = [ "secur32.lib" ]
-}
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 7f2bbae..031100f 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -279,7 +279,7 @@ std::string ChromeLauncher::CreateServiceStateFile(
   base::JSONWriter::Write(printer_list, &printers_json);
   size_t written = base::WriteFile(printers_file,
                                    printers_json.c_str(),
-                                   static_cast<int>(printers_json.size()));
+                                   printers_json.size());
   if (written != printers_json.size()) {
     LOG(ERROR) << "Can't write file.";
     return std::string();
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index 8c5a4a0..92e5fec 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -361,8 +361,8 @@ class CloudPrintServiceModule
     }
 
     if (new_contents != contents) {
-      size_t written = base::WriteFile(
-          file, new_contents.c_str(), static_cast<int>(new_contents.size()));
+      size_t  written = base::WriteFile(file, new_contents.c_str(),
+                                              new_contents.size());
       if (written != new_contents.size()) {
         return ReportError(cloud_print::GetLastHResult(),
                            IDS_ERROR_FAILED_CREATE_CONFIG);
diff --git a/cloud_print/service/win/cloud_print_service_config.cc b/cloud_print/service/win/cloud_print_service_config.cc
index bfb4af9..278c0dc 100644
--- a/cloud_print/service/win/cloud_print_service_config.cc
+++ b/cloud_print/service/win/cloud_print_service_config.cc
@@ -17,7 +17,7 @@
 #include "base/threading/thread.h"
 #include "chrome/common/chrome_constants.h"
 #include "cloud_print/common/win/cloud_print_utils.h"
-#include "cloud_print/service/resources.h"
+#include "cloud_print/resources.h"
 #include "cloud_print/service/service_state.h"
 #include "cloud_print/service/win/chrome_launcher.h"
 #include "cloud_print/service/win/service_controller.h"
@@ -297,8 +297,7 @@ base::string16 SetupDialog::GetDlgItemText(int id) const {
   const ATL::CWindow& item = GetDlgItem(id);
   size_t length = item.GetWindowTextLength();
   base::string16 result(length + 1, L'\0');
-  result.resize(item.GetWindowText(&result[0],
-                                   static_cast<int>(result.size())));
+  result.resize(item.GetWindowText(&result[0], result.size()));
   return result;
 }
 
@@ -397,7 +396,7 @@ void SetupDialog::Install(const base::string16& user,
     return ShowError(IDS_ERROR_FAILED_CREATE_CONFIG);
 
   size_t written = base::WriteFile(file, contents.c_str(),
-                                   static_cast<int>(contents.size()));
+                                        contents.size());
   if (written != contents.size()) {
     DWORD last_error = GetLastError();
     if (!last_error)
diff --git a/cloud_print/service/win/installer.cc b/cloud_print/service/win/installer.cc
index e09eca3..312af6e 100644
--- a/cloud_print/service/win/installer.cc
+++ b/cloud_print/service/win/installer.cc
@@ -14,7 +14,7 @@
 #include "base/win/shortcut.h"
 #include "cloud_print/common/win/cloud_print_utils.h"
 #include "cloud_print/common/win/install_utils.h"
-#include "cloud_print/service/resources.h"
+#include "cloud_print/resources.h"
 #include "cloud_print/service/service_constants.h"
 #include "cloud_print/service/service_switches.h"
 #include "cloud_print/service/win/service_controller.h"
diff --git a/cloud_print/service/win/local_security_policy.cc b/cloud_print/service/win/local_security_policy.cc
index e9830b3..874498d 100644
--- a/cloud_print/service/win/local_security_policy.cc
+++ b/cloud_print/service/win/local_security_policy.cc
@@ -109,8 +109,8 @@ bool LocalSecurityPolicy::SetPrivilege(const base::string16& username,
   LSA_UNICODE_STRING privilege_string;
   base::string16 privilage_copy(privilage);
   privilege_string.Buffer = &privilage_copy[0];
-  privilege_string.Length = static_cast<USHORT>(
-      wcslen(privilege_string.Buffer) * sizeof(privilege_string.Buffer[0]));
+  privilege_string.Length = wcslen(privilege_string.Buffer) *
+                            sizeof(privilege_string.Buffer[0]);
   privilege_string.MaximumLength = privilege_string.Length +
                                    sizeof(privilege_string.Buffer[0]);
   return STATUS_SUCCESS ==
diff --git a/cloud_print/service/win/service.gyp b/cloud_print/service/win/service.gyp
index 5434c49..0019b6f 100644
--- a/cloud_print/service/win/service.gyp
+++ b/cloud_print/service/win/service.gyp
@@ -22,10 +22,11 @@
       '_ATL_NO_AUTOMATIC_NAMESPACE',
       '_ATL_NO_EXCEPTIONS',
     ],
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    'msvs_disabled_warnings': [ 4267, ],
   },
   'targets': [
     {
-      # GN version: //cloud_print/service/win:cloud_print_service
       'target_name': 'cloud_print_service',
       'type': 'executable',
       'sources': [
@@ -50,7 +51,6 @@
       },
     },
     {
-      # GN version: //cloud_print/service/win:cloud_print_service_config
       'target_name': 'cloud_print_service_config',
       'type': 'executable',
       'sources': [
@@ -99,7 +99,6 @@
       },
     },
     {
-      # GN version: //cloud_print/service/win:cloud_print_service_setup
       'target_name': 'cloud_print_service_setup',
       'type': 'executable',
       'sources': [
diff --git a/cloud_print/service/win/service_controller.cc b/cloud_print/service/win/service_controller.cc
index 9775752..7bbce31 100644
--- a/cloud_print/service/win/service_controller.cc
+++ b/cloud_print/service/win/service_controller.cc
@@ -300,8 +300,7 @@ void ServiceController::UpdateState() {
   std::vector<uint8> buffer(config_size, 0);
   QUERY_SERVICE_CONFIG* config =
       reinterpret_cast<QUERY_SERVICE_CONFIG*>(&buffer[0]);
-  if (!::QueryServiceConfig(service.Get(), config,
-                            static_cast<DWORD>(buffer.size()),
+  if (!::QueryServiceConfig(service.Get(), config, buffer.size(),
                             &config_size) ||
       config_size != buffer.size()) {
     return;
diff --git a/cloud_print/service/win/service_controller.h b/cloud_print/service/win/service_controller.h
index fcec4fd..6868fbd 100644
--- a/cloud_print/service/win/service_controller.h
+++ b/cloud_print/service/win/service_controller.h
@@ -10,7 +10,7 @@
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
-#include "cloud_print/service/resources.h"
+#include "cloud_print/resources.h"
 
 namespace base {
 class FilePath;
diff --git a/cloud_print/virtual_driver/win/BUILD.gn b/cloud_print/virtual_driver/win/BUILD.gn
deleted file mode 100644
index 110b5a3..0000000
--- a/cloud_print/virtual_driver/win/BUILD.gn
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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.
-
-assert(is_win)
-
-source_set("win") {
-  sources = [
-    "virtual_driver_consts.cc",
-    "virtual_driver_consts.h",
-    "virtual_driver_helpers.cc",
-    "virtual_driver_helpers.h",
-  ]
-
-  deps = [
-    "//base",
-    "//cloud_print/common",
-  ]
-}
diff --git a/cloud_print/virtual_driver/win/install/BUILD.gn b/cloud_print/virtual_driver/win/install/BUILD.gn
deleted file mode 100644
index edcf769..0000000
--- a/cloud_print/virtual_driver/win/install/BUILD.gn
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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("//chrome/version.gni")
-import("//tools/grit/grit_rule.gni")
-
-assert(is_win)
-
-executable("virtual_driver_setup") {
-  sources = [
-    "setup.cc",
-  ]
-
-  configs -= [ "//build/config/win:console" ]
-  configs += [ "//build/config/win:windowed" ]
-
-  deps = [
-    ":copy_gcp_driver",
-    ":resources",
-    ":setup_version",
-    "//base",
-    "//cloud_print/common:install_utils",
-    "//cloud_print/virtual_driver/win",
-  ]
-
-  libs = [ "setupapi.lib" ]
-  ldflags = [ "/DELAYLOAD:winspool.drv" ]
-}
-
-copy("copy_gcp_driver") {
-  sources = [
-    "../../gcp_driver.gpd",
-  ]
-  outputs = [
-    "$root_build_dir/gcp_driver.gpd",
-  ]
-}
-
-process_version("setup_version") {
-  template_file = chrome_version_rc_template
-  sources = [
-    "virtual_driver_setup_exe.ver",
-  ]
-  output = "$target_gen_dir/virtual_driver_setup.rc"
-}
-
-grit("resources") {
-  visibility = [ ":*" ]
-
-  source = "virtual_driver_setup_resources.grd"
-
-  output_dir = "$root_gen_dir/virtual_driver_setup_resources"
-
-  outputs = [
-    "grit/virtual_driver_setup_resources.h",
-    "virtual_driver_setup_resources_ar.rc",
-    "virtual_driver_setup_resources_bg.rc",
-    "virtual_driver_setup_resources_bn.rc",
-    "virtual_driver_setup_resources_ca.rc",
-    "virtual_driver_setup_resources_cs.rc",
-    "virtual_driver_setup_resources_da.rc",
-    "virtual_driver_setup_resources_de.rc",
-    "virtual_driver_setup_resources_el.rc",
-    "virtual_driver_setup_resources_en.rc",
-    "virtual_driver_setup_resources_en-GB.rc",
-    "virtual_driver_setup_resources_es.rc",
-    "virtual_driver_setup_resources_es-419.rc",
-    "virtual_driver_setup_resources_et.rc",
-    "virtual_driver_setup_resources_fa.rc",
-    "virtual_driver_setup_resources_fi.rc",
-    "virtual_driver_setup_resources_fil.rc",
-    "virtual_driver_setup_resources_fr.rc",
-    "virtual_driver_setup_resources_gu.rc",
-    "virtual_driver_setup_resources_he.rc",
-    "virtual_driver_setup_resources_hi.rc",
-    "virtual_driver_setup_resources_hr.rc",
-    "virtual_driver_setup_resources_hu.rc",
-    "virtual_driver_setup_resources_id.rc",
-    "virtual_driver_setup_resources_it.rc",
-    "virtual_driver_setup_resources_ja.rc",
-    "virtual_driver_setup_resources_kn.rc",
-    "virtual_driver_setup_resources_ko.rc",
-    "virtual_driver_setup_resources_lt.rc",
-    "virtual_driver_setup_resources_lv.rc",
-    "virtual_driver_setup_resources_ml.rc",
-    "virtual_driver_setup_resources_mr.rc",
-    "virtual_driver_setup_resources_ms.rc",
-    "virtual_driver_setup_resources_nl.rc",
-    "virtual_driver_setup_resources_nb.rc",
-    "virtual_driver_setup_resources_pl.rc",
-    "virtual_driver_setup_resources_pt-BR.rc",
-    "virtual_driver_setup_resources_pt-PT.rc",
-    "virtual_driver_setup_resources_ro.rc",
-    "virtual_driver_setup_resources_ru.rc",
-    "virtual_driver_setup_resources_sk.rc",
-    "virtual_driver_setup_resources_sl.rc",
-    "virtual_driver_setup_resources_sr.rc",
-    "virtual_driver_setup_resources_sv.rc",
-    "virtual_driver_setup_resources_sw.rc",
-    "virtual_driver_setup_resources_ta.rc",
-    "virtual_driver_setup_resources_te.rc",
-    "virtual_driver_setup_resources_th.rc",
-    "virtual_driver_setup_resources_tr.rc",
-    "virtual_driver_setup_resources_uk.rc",
-    "virtual_driver_setup_resources_vi.rc",
-    "virtual_driver_setup_resources_zh-CN.rc",
-    "virtual_driver_setup_resources_zh-TW.rc",
-  ]
-}
diff --git a/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp b/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
index a788f1a..6b19304 100644
--- a/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
+++ b/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
@@ -13,7 +13,6 @@
   },
   'targets' : [
     {
-      # GN version: //cloud_print/virtual_driver/win/install:virtual_driver_setup
       'target_name': 'virtual_driver_setup',
       'type': 'executable',
       'include_dirs': [
@@ -103,7 +102,6 @@
       ],
     },
     {
-      # GN version: //cloud_print/virtual_driver/win/install:resources
       'target_name': 'virtual_driver_setup_resources',
       'type': 'none',
       'variables': {
diff --git a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
deleted file mode 100644
index a9e5b35..0000000
--- a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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("//chrome/version.gni")
-
-assert(is_win)
-
-# When cross-compiling a 64-bit driver for a 32-bit build, some things get name
-# mangled with this suffix.
-if (target_cpu == "x86" && current_cpu == "x64") {
-  arch_suffix = "64"
-} else {
-  arch_suffix = ""
-}
-
-print("port_monitor $current_toolchain")
-
-shared_library("port_monitor") {
-  output_name = "gcp_portmon$arch_suffix"
-
-  sources = [
-    "port_monitor.def",
-    "port_monitor_dll.cc",
-  ]
-
-  deps = [
-    ":lib",
-    ":resources",
-    "//base",
-    "//chrome:version_header",
-    "//chrome/common:constants",
-  ]
-
-  libs = [ "userenv.lib" ]
-}
-
-source_set("lib") {
-  sources = [
-    "port_monitor.cc",
-    "port_monitor.h",
-  ]
-
-  deps = [
-    "//base",
-    "//chrome/common:constants",
-    "//chrome/installer/launcher_support",
-    "//cloud_print/virtual_driver/win",
-  ]
-}
-
-process_version("resources") {
-  template_file = chrome_version_rc_template
-  sources = [
-    "../gcp_portmon${arch_suffix}_dll.ver",
-  ]
-
-  # Note: target_gen_dir will be different for each toolchain so the output
-  # name doesn't need mangling.
-  output = "$target_gen_dir/gcp_portmon_dll.rc"
-}
diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi
index 1595883..41b2a97 100644
--- a/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -16,7 +16,6 @@
   },
   'targets' : [
     {
-      # GN version: //cloud_print/virtual_driver/win
       'target_name': 'virtual_driver_lib<(virtual_driver_suffix)',
       'type': 'static_library',
       'sources': [
@@ -29,7 +28,6 @@
       ],
     },
     {
-      # GN version: //cloud_print/virtual_driver/win/port_monitor:lib
       'target_name': 'gcp_portmon_lib<(virtual_driver_suffix)',
       'type': 'static_library',
       'sources': [
@@ -41,7 +39,6 @@
       ],
     },
     {
-      # GN version: //cloud_print/virtual_driver/win/port_monitor
       'target_name': 'gcp_portmon<(virtual_driver_suffix)',
       'type': 'loadable_module',
       'sources': [