Revert of Cleanup chrome/version.h handling (patchset #7 id:120001 of https://codereview.chromium.org/1405633002/ )

Reason for revert:
Appears to be breaking at least Mac GN build

Example failure: http://build.chromium.org/p/chromium.mac/builders/Mac%20GN%20%28dbg%29/builds/23114

Original issue's description:
> Cleanup chrome/common/chrome_version.h handling
>
> Rename "version.h" to "chrome/common/chrome_version.h"
> Update #include and GYP/GN references
> Generate on all platforms
> Remove redundant generated chrome/common/chrome_version.cc.version
> Fix DEPS include_rules
>
> BUG=542807
>
> Committed: https://crrev.com/59647ecac9524d954010d3d10b539ee4a340bf94
> Cr-Commit-Position: refs/heads/master@{#355196}

TBR=brettw@chromium.org,mdempsky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=542807

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

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

26 files changed, 123 insertions, 86 deletions

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 4693d6c..67431e3 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -425,6 +425,22 @@ group("child_dependencies") {
 }
 
 if (is_win) {
+  # TODO(brettw) this duplicates "//chrome/common:version" which applies to
+  # Linux.
+  process_version("version_header") {
+    # TODO(brettW) this should have more reduced visibility, but chrome/browser
+    # currently depends on this.
+    #visibility = [ ":*" ]
+
+    # This one just uses the custom template and no separate sources.
+    sources = []
+    template_file = "version.h.in"
+
+    # TODO(brettw) this should move to $target_gen_dir/version.h and
+    # source files including it should reference it via "chrome/version.h"
+    output = "$root_gen_dir/version.h"
+  }
+
   process_version("chrome_exe_version") {
     template_file = chrome_version_rc_template
     sources = [
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index d1f8d3e..791cc0e 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -765,7 +765,7 @@ source_set("browser") {
     ]
     deps += [
       ":chrome_process_finder",
-      "//chrome/common:version_header",
+      "//chrome:version_header",
       "//chrome/installer/util:strings",
       "//chrome_elf",
       "//chrome_elf:constants",
diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
index 0b3e806..dc32585 100644
--- a/chrome/browser/chrome_elf_init_unittest_win.cc
+++ b/chrome/browser/chrome_elf_init_unittest_win.cc
@@ -10,13 +10,13 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "version.h"  // NOLINT
 
 namespace {
 
diff --git a/chrome/browser/chrome_elf_init_win.cc b/chrome/browser/chrome_elf_init_win.cc
index 28af7f8..3d568a6 100644
--- a/chrome/browser/chrome_elf_init_win.cc
+++ b/chrome/browser/chrome_elf_init_win.cc
@@ -9,12 +9,12 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/chrome_elf_init_win.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome_elf/blacklist/blacklist.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "chrome_elf/dll_hash/dll_hash.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
+#include "version.h"  // NOLINT
 
 const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
 const char kBrowserBlacklistTrialDisabledGroupName[] = "NoBlacklist";
diff --git a/chrome/browser/google/google_update_win_unittest.cc b/chrome/browser/google/google_update_win_unittest.cc
index 16d2362..700c10c 100644
--- a/chrome/browser/google/google_update_win_unittest.cc
+++ b/chrome/browser/google/google_update_win_unittest.cc
@@ -22,7 +22,6 @@
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/helper.h"
@@ -30,6 +29,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/win/atl_module.h"
+#include "version.h"
 
 using ::testing::DoAll;
 using ::testing::HasSubstr;
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
index e2013cb..1a61a47 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win.cc
@@ -7,7 +7,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "chrome/common/chrome_version.h"
+#include "version.h"  // NOLINT
 
 namespace safe_browsing {
 
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
index b2055f1..9ef043b 100644
--- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
@@ -13,10 +13,10 @@
 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
 #include "chrome/browser/safe_browsing/incident_reporting/mock_incident_receiver.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "version.h"  // NOLINT
 
 using ::testing::_;
 using ::testing::StrictMock;
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c9986e1..5fae3f0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -415,6 +415,41 @@
           ],
         },
         {
+          # GN version: //chrome:version_header
+          'target_name': 'chrome_version_header',
+          'type': 'none',
+          'hard_dependency': 1,
+          'actions': [
+            {
+              'action_name': 'version_header',
+              'variables': {
+                'lastchange_path':
+                  '<(DEPTH)/build/util/LASTCHANGE',
+                'branding_path': 'app/theme/<(branding_path_component)/BRANDING',
+              },
+              'inputs': [
+                '<(version_path)',
+                '<(branding_path)',
+                '<(lastchange_path)',
+                'version.h.in',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/version.h',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(branding_path)',
+                '-f', '<(lastchange_path)',
+                'version.h.in',
+                '<@(_outputs)',
+              ],
+              'message': 'Generating version header file: <@(_outputs)',
+            },
+          ],
+        },
+        {
           'target_name': 'crash_service',
           'type': 'executable',
           'dependencies': [
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1b3b86f..3256e03 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3729,7 +3729,7 @@
             'chrome_process_finder',
             'chrome_watcher_client',
             'installer_util_strings',
-            '../chrome/common_constants.gyp:version_header',
+            '../chrome/chrome.gyp:chrome_version_header',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
             '../chrome_elf/chrome_elf.gyp:dll_hash',
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 9811b15..b7b6a3c 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -214,12 +214,12 @@
           'target_name': 'setup',
           'type': 'executable',
           'dependencies': [
+            'chrome_version_header',
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/common_constants.gyp:common_constants',
-            '../chrome/common_constants.gyp:version_header',
             '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
             '../rlz/rlz.gyp:rlz_lib',
             '../third_party/zlib/zlib.gyp:zlib',
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 9701994..e1f8f3a 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -36,7 +36,7 @@ if (enable_extensions) {
   }
 }
 
-# GYP version: chrome/chrome_common.gypi:common
+# GYP version: chrome/chrome_common.gyp:common
 static_library("common") {
   sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
   defines = []
@@ -269,20 +269,12 @@ static_library("common") {
   }
 }
 
-# GYP version: chrome/common_constants.gyp:version_header
-process_version("version_header") {
-  # TODO(brettw) this should have more reduced visibility, but chrome/browser
-  # currently depends on this.
-  #visibility = [ ":*" ]
-
-  # This one just uses the custom template and no separate sources.
-  sources = []
-  template_file = "chrome_version.h.in"
-
-  output = "$target_gen_dir/chrome_version.h"
+process_version("make_chrome_version") {
+  template_file = "chrome_version.cc.version"
+  output = "$target_gen_dir/chrome_version.cc"
 }
 
-# GYP version: chrome/common_constants.gyp:common_constants
+# GN version: chrome/common_constants.gyp:common_constants
 static_library("constants") {
   sources = [
     "chrome_constants.cc",
@@ -311,7 +303,7 @@ static_library("constants") {
     "//content/public/common:result_codes",
   ]
   deps = [
-    ":version_header",
+    ":make_chrome_version",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//components/bookmarks/common",
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 206f8e2..31fcdc8 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_version.h"
 
 #define FPL FILE_PATH_LITERAL
 
@@ -20,8 +19,6 @@
 
 namespace chrome {
 
-const char kChromeVersion[] = CHROME_VERSION_STRING;
-
 #if defined(OS_WIN)
 const char kChromeVersionEnvVar[] = "CHROME_VERSION";
 #endif
diff --git a/chrome/common/chrome_version.cc.version b/chrome/common/chrome_version.cc.version
new file mode 100644
index 0000000..54e062b
--- /dev/null
+++ b/chrome/common/chrome_version.cc.version
@@ -0,0 +1,11 @@
+// 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.
+
+#include "chrome/common/chrome_constants.h"
+
+namespace chrome {
+
+const char kChromeVersion[] = "@MAJOR@.@MINOR@.@BUILD@.@PATCH@";
+
+}  // namespace chrome
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index 134878e..4e79cdd 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -5,7 +5,14 @@
 {
   'variables': {
     'chromium_code': 1,
-    'common_constants_sources': [
+  },
+
+  'includes': [
+    '../build/util/version.gypi',
+  ],
+
+  'target_defaults': {
+    'sources': [
       'common/chrome_constants.cc',
       'common/chrome_constants.h',
       'common/chrome_icon_resources_win.cc',
@@ -26,60 +33,43 @@
       'common/pref_names.cc',
       'common/pref_names.h',
     ],
+    'actions': [
+      {
+        'action_name': 'Make chrome_version.cc',
+        'variables': {
+          'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
+          'template_input_path': 'common/chrome_version.cc.version',
+        },
+        'inputs': [
+          '<(version_py_path)',
+          '<(version_path)',
+          '<(lastchange_path)',
+          '<(template_input_path)',
+        ],
+        'outputs': [
+          '<(INTERMEDIATE_DIR)/chrome_version.cc',
+        ],
+        'action': [
+          'python',
+          '<(version_py_path)',
+          '-f', '<(version_path)',
+          '-f', '<(lastchange_path)',
+          '<(template_input_path)',
+          '<@(_outputs)',
+        ],
+        'process_outputs_as_sources': 1,
+      },
+    ],
   },
-
-  'includes': [
-    '../build/util/version.gypi',
-  ],
-
   'targets': [
     {
-      # GN version: //chrome/common:version_header
-      'target_name': 'version_header',
-      'type': 'none',
-      'hard_dependency': 1,
-      'actions': [
-        {
-          'action_name': 'version_header',
-          'variables': {
-            'lastchange_path':
-              '<(DEPTH)/build/util/LASTCHANGE',
-            'branding_path': 'app/theme/<(branding_path_component)/BRANDING',
-          },
-          'inputs': [
-            '<(version_path)',
-            '<(branding_path)',
-            '<(lastchange_path)',
-            'common/chrome_version.h.in',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version.h',
-          ],
-          'action': [
-            'python',
-            '<(version_py_path)',
-            '-f', '<(version_path)',
-            '-f', '<(branding_path)',
-            '-f', '<(lastchange_path)',
-            'common/chrome_version.h.in',
-            '<@(_outputs)',
-          ],
-          'message': 'Generating version header file: <@(_outputs)',
-        },
-      ],
-    },
-    {
       # GN version: //chrome/common:constants
       'target_name': 'common_constants',
       'type': 'static_library',
-      'sources': [
-        '<@(common_constants_sources)'
-      ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
       ],
       'dependencies': [
-        'version_header',
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../components/components.gyp:bookmarks_common',
@@ -109,14 +99,10 @@
         {
           'target_name': 'common_constants_win64',
           'type': 'static_library',
-          'sources': [
-            '<@(common_constants_sources)'
-          ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',  # Needed by chrome_paths.cc.
           ],
           'dependencies': [
-            'version_header',
             '../base/base.gyp:base_win64',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
             '../components/nacl.gyp:nacl_switches_win64',
diff --git a/chrome/installer/setup/BUILD.gn b/chrome/installer/setup/BUILD.gn
index 8a9fde9..c09138e 100644
--- a/chrome/installer/setup/BUILD.gn
+++ b/chrome/installer/setup/BUILD.gn
@@ -23,7 +23,7 @@ if (is_win) {
     deps = [
       ":lib",
       "//build/config/sanitizers:deps",
-      "//chrome/common:version_header",
+      "//chrome:version_header",
     ]
   }
 
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 94cab45..ae50659 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -40,7 +40,6 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome/installer/setup/archive_patch_helper.h"
 #include "chrome/installer/setup/install.h"
 #include "chrome/installer/setup/install_worker.h"
@@ -69,6 +68,7 @@
 #include "chrome/installer/util/self_cleaning_temp_dir.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/user_experiment.h"
+#include "version.h"  // NOLINT
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/installer/util/updating_app_registration_data.h"
diff --git a/chrome/common/chrome_version.h.in b/chrome/version.h.in
index f0a0bcd..f0a0bcd 100644
--- a/chrome/common/chrome_version.h.in
+++ b/chrome/version.h.in
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn
index 1a1af75..64f5b7b 100644
--- a/chrome_elf/BUILD.gn
+++ b/chrome_elf/BUILD.gn
@@ -90,7 +90,7 @@ source_set("breakpad") {
   deps = [
     ":common",
     "//breakpad:breakpad_handler",
-    "//chrome/common:version_header",
+    "//chrome:version_header",
   ]
 }
 
diff --git a/chrome_elf/DEPS b/chrome_elf/DEPS
index d838479..495665e 100644
--- a/chrome_elf/DEPS
+++ b/chrome_elf/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
   "+sandbox",
   "+breakpad/src/client",
-  "+chrome/common/chrome_version.h",
 ]
diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc
index 09d6a73..b8f1ea2 100644
--- a/chrome_elf/blacklist/test/blacklist_test.cc
+++ b/chrome_elf/blacklist/test/blacklist_test.cc
@@ -13,11 +13,11 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome_elf/blacklist/blacklist.h"
 #include "chrome_elf/blacklist/test/blacklist_test_main_dll.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "version.h"  // NOLINT
 
 const wchar_t kTestDllName1[] = L"blacklist_test_dll_1.dll";
 const wchar_t kTestDllName2[] = L"blacklist_test_dll_2.dll";
diff --git a/chrome_elf/breakpad.cc b/chrome_elf/breakpad.cc
index d67b5dc..3c95a4f 100644
--- a/chrome_elf/breakpad.cc
+++ b/chrome_elf/breakpad.cc
@@ -11,8 +11,8 @@
 
 #include "base/macros.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
-#include "chrome/common/chrome_version.h"
 #include "chrome_elf/chrome_elf_util.h"
+#include "version.h"  // NOLINT
 
 google_breakpad::ExceptionHandler* g_elf_breakpad = NULL;
 
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 5b7998d..cbbb4b4 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -165,7 +165,7 @@
       'dependencies': [
         'chrome_elf_common',
         '../breakpad/breakpad.gyp:breakpad_handler',
-        '../chrome/common_constants.gyp:version_header',
+        '../chrome/chrome.gyp:chrome_version_header',
       ],
     },
   ], # targets
@@ -202,3 +202,4 @@
     }],
   ],
 }
+
diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp
index aba2e1e..8ebd5cd 100644
--- a/cloud_print/cloud_print_resources.gyp
+++ b/cloud_print/cloud_print_resources.gyp
@@ -68,7 +68,7 @@
             '<(version_path)',
             '<(branding_path)',
             '<(lastchange_path)',
-            '<(DEPTH)/chrome/common/chrome_version.h.in',
+            '<(DEPTH)/chrome/version.h.in',
             'BRANDING',
           ],
           'outputs': [
@@ -81,7 +81,7 @@
             '-f', '<(branding_path)',
             '-f', '<(lastchange_path)',
             '-f', 'BRANDING',
-            '<(DEPTH)/chrome/common/chrome_version.h.in',
+            '<(DEPTH)/chrome/version.h.in',
             '<@(_outputs)',
           ],
           'message': 'Generating version header file: <@(_outputs)',
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 1b8396f..a6171a8 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -60,9 +60,9 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
+            '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
             '<(DEPTH)/chrome/chrome.gyp:launcher_support',
             '<(DEPTH)/chrome/common_constants.gyp:common_constants',
-            '<(DEPTH)/chrome/common_constants.gyp:version_header',
           ],
         }],
         ['OS=="win" and clang==1', {
diff --git a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
index 4365337..f6e727f 100644
--- a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
+++ b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
@@ -26,8 +26,8 @@ shared_library("port_monitor") {
     ":lib",
     ":resources",
     "//base",
+    "//chrome:version_header",
     "//chrome/common:constants",
-    "//chrome/common:version_header",
   ]
 
   libs = [ "userenv.lib" ]
diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi
index 886f746..1595883 100644
--- a/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -51,7 +51,7 @@
       ],
       'dependencies': [
         'gcp_portmon_lib<(virtual_driver_suffix)',
-        '<(DEPTH)/chrome/common_constants.gyp:version_header',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
         '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
       ],
       'include_dirs': [