Revert of Cleanup chrome/version.h handling

chrome/browser/chrome_elf_init_unittest_win.cc

 // Copyright 2014 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/browser/chrome_elf_init_win.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #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 {
 
 const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
 
 class ChromeBlacklistTrialTest : public testing::Test {
  protected:
   ChromeBlacklistTrialTest() {}
   ~ChromeBlacklistTrialTest() override {}
 
@@ skipping 157 matching lines @@
 
   for (std::map<std::string, std::string>::iterator it = desired_params.begin();
        it != desired_params.end();
        ++it) {
     std::wstring name = base::UTF8ToWide(it->first);
     ASSERT_TRUE(finch_blacklist_registry_key.HasValue(name.c_str()));
   }
 }
 
 }  // namespace