Cleanup VersionInfo after componentization.

chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

 // Copyright 2013 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/nacl_host/nacl_browser_delegate_impl.h"
 
 #include <vector>
 
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/pnacl_component_installer.h"
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
 #endif
 #include "chrome/browser/nacl_host/nacl_infobar_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pepper_permission_util.h"
 #include "content/public/browser/browser_thread.h"
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/url_pattern.h"
@@ skipping 93 matching lines @@
 
 bool NaClBrowserDelegateImpl::GetPnaclDirectory(base::FilePath* pnacl_dir) {
   return PathService::Get(chrome::DIR_PNACL_COMPONENT, pnacl_dir);
 }
 
 bool NaClBrowserDelegateImpl::GetUserDirectory(base::FilePath* user_dir) {
   return PathService::Get(chrome::DIR_USER_DATA, user_dir);
 }
 
 std::string NaClBrowserDelegateImpl::GetVersionString() const {
-  return chrome::VersionInfo().CreateVersionString();
+  return chrome::GetVersionString();
 }
 
 ppapi::host::HostFactory* NaClBrowserDelegateImpl::CreatePpapiHostFactory(
     content::BrowserPpapiHost* ppapi_host) {
   return new chrome::ChromeBrowserPepperHostFactory(ppapi_host);
 }
 
 void NaClBrowserDelegateImpl::SetDebugPatterns(
     const std::string& debug_patterns) {
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 94 matching lines @@
     const base::FilePath& profile_directory) {
   // Get the profile associated with the renderer.
   Profile* profile = profile_manager_->GetProfileByPath(profile_directory);
   DCHECK(profile);
   scoped_refptr<extensions::InfoMap> extension_info_map =
       extensions::ExtensionSystem::Get(profile)->info_map();
   DCHECK(extension_info_map.get());
   return extension_info_map;
 }
 #endif