Cleanup VersionInfo after componentization.

chrome/browser/web_applications/web_app_mac_unittest.mm

 // Copyright (c) 2012 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/browser/web_applications/web_app_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <errno.h>
 #include <sys/xattr.h>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #import "chrome/common/mac/app_mode_common.h"
+#include "components/version_info/version_info.h"
 #include "grit/theme_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 using ::testing::_;
 using ::testing::Return;
@@ skipping 94 matching lines @@
       shim_path_.Append("Contents").Append("Info.plist");
   NSDictionary* plist = [NSDictionary dictionaryWithContentsOfFile:
       base::mac::FilePathToNSString(plist_path)];
   EXPECT_NSEQ(base::SysUTF8ToNSString(info_->extension_id),
               [plist objectForKey:app_mode::kCrAppModeShortcutIDKey]);
   EXPECT_NSEQ(base::SysUTF16ToNSString(info_->title),
               [plist objectForKey:app_mode::kCrAppModeShortcutNameKey]);
   EXPECT_NSEQ(base::SysUTF8ToNSString(info_->url.spec()),
               [plist objectForKey:app_mode::kCrAppModeShortcutURLKey]);
 
-  EXPECT_NSEQ(base::SysUTF8ToNSString(chrome::VersionInfo().Version()),
+  EXPECT_NSEQ(base::SysUTF8ToNSString(version_info::GetVersionNumber()),
               [plist objectForKey:app_mode::kCrBundleVersionKey]);
   EXPECT_NSEQ(base::SysUTF8ToNSString(info_->version_for_display),
               [plist objectForKey:app_mode::kCFBundleShortVersionStringKey]);
 
   // Make sure all values in the plist are actually filled in.
   for (id key in plist) {
     id value = [plist valueForKey:key];
     if (!base::mac::ObjCCast<NSString>(value))
       continue;
 
@@ skipping 237 matching lines @@
               [file_handler_1 objectForKey:app_mode::kCFBundleTypeRoleKey]);
   NSArray* file_handler_1_extensions =
       [file_handler_1 objectForKey:app_mode::kCFBundleTypeExtensionsKey];
   EXPECT_TRUE([file_handler_1_extensions containsObject:@"ext2"]);
   NSArray* file_handler_1_types =
       [file_handler_1 objectForKey:app_mode::kCFBundleTypeMIMETypesKey];
   EXPECT_TRUE([file_handler_1_types containsObject:@"type2"]);
 }
 
 }  // namespace web_app