Cleanup VersionInfo after componentization.

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_info.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:
@@ skipping 42 matching lines @@
                                       blacklist::BLACKLIST_DISABLED);
   blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion, L"Data");
 
   // This setup code should result in the default group, which should have
   // the blacklist set up.
   InitializeChromeElf();
 
   // Ensure the beacon values are now correct, indicating the
   // blacklist beacon was setup.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
-  chrome::VersionInfo version_info;
-  base::string16 version(base::UTF8ToUTF16(version_info.Version()));
+  base::string16 version(base::UTF8ToUTF16(version_info::GetVersionNumber()));
   ASSERT_EQ(version, GetBlacklistVersion());
 }
 
 // Ensure that the blacklist is disabled for any users in the
 // "BlacklistDisabled" finch group.
 TEST_F(ChromeBlacklistTrialTest, BlacklistDisabledRun) {
   // Set the beacons to enabled values.
   blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
                                       blacklist::BLACKLIST_ENABLED);
   blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion, L"Data");
@@ skipping 14 matching lines @@
   ASSERT_EQ(blacklist::BLACKLIST_STATE_MAX, GetBlacklistState());
   ASSERT_EQ(base::string16(), GetBlacklistVersion());
 }
 
 TEST_F(ChromeBlacklistTrialTest, VerifyFirstRun) {
   BrowserBlacklistBeaconSetup();
 
   // Verify the state is properly set after the first run.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
 
-  chrome::VersionInfo version_info;
-  base::string16 version(base::UTF8ToUTF16(version_info.Version()));
+  base::string16 version(base::UTF8ToUTF16(version_info::GetVersionNumber()));
   ASSERT_EQ(version, GetBlacklistVersion());
 }
 
 TEST_F(ChromeBlacklistTrialTest, BlacklistFailed) {
   // Ensure when the blacklist set up failed we set the state to disabled for
   // future runs.
   blacklist_registry_key_->WriteValue(blacklist::kBeaconVersion,
                                       TEXT(CHROME_VERSION_STRING));
   blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
                                       blacklist::BLACKLIST_SETUP_FAILED);
@@ skipping 12 matching lines @@
   blacklist_registry_key_->WriteValue(blacklist::kBeaconState,
                                       blacklist::BLACKLIST_DISABLED);
   blacklist_registry_key_->WriteValue(blacklist::kBeaconAttemptCount,
                                       blacklist::kBeaconMaxAttempts);
 
   BrowserBlacklistBeaconSetup();
 
   // The beacon should now be marked as enabled for the current version.
   ASSERT_EQ(blacklist::BLACKLIST_ENABLED, GetBlacklistState());
 
-  chrome::VersionInfo version_info;
-  base::string16 expected_version(base::UTF8ToUTF16(version_info.Version()));
+  base::string16 expected_version(
+      base::UTF8ToUTF16(version_info::GetVersionNumber()));
   ASSERT_EQ(expected_version, GetBlacklistVersion());
 
   // The counter should be reset.
   DWORD attempt_count = blacklist::kBeaconMaxAttempts;
   blacklist_registry_key_->ReadValueDW(blacklist::kBeaconAttemptCount,
                                        &attempt_count);
   ASSERT_EQ(static_cast<DWORD>(0), attempt_count);
 }
 
 TEST_F(ChromeBlacklistTrialTest, AddFinchBlacklistToRegistry) {
@@ skipping 28 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