Cleanup VersionInfo after componentization.

chrome/app/close_handle_hook_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/app/close_handle_hook_win.h"
 
 #include <Windows.h>
 #include <psapi.h>
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/pe_image.h"
 #include "base/win/scoped_handle.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
+#include "components/version_info/version_info.h"
 
 namespace {
 
 typedef BOOL (WINAPI* CloseHandleType) (HANDLE handle);
 CloseHandleType g_close_function = NULL;
 
 // The entry point for CloseHandle interception. This function notifies the
 // verifier about the handle that is being closed, and calls the original
 // function.
 BOOL WINAPI CloseHandleHook(HANDLE handle) {
@@ skipping 149 matching lines @@
        it != hooks_.end(); ++it) {
     (*it)->Unpatch();
     delete *it;
   }
 }
 
 bool UseHooks() {
 #if defined(ARCH_CPU_X86_64)
   return false;
 #elif defined(NDEBUG)
-  version_info::Channel channel = chrome::VersionInfo::GetChannel();
+  version_info::Channel channel = chrome::GetChannel();
   if (channel == version_info::Channel::CANARY ||
       channel == version_info::Channel::DEV ||
       channel == version_info::Channel::UNKNOWN) {
     return true;
   }
 
   return false;
 #else  // NDEBUG
   return true;
 #endif
@@ skipping 25 matching lines @@
     // threads attempting to call CloseHandle.
     hooks->AddEATPatch();
     PatchLoadedModules(hooks);
   }
 }
 
 void RemoveCloseHandleHooks() {
   // We are partching all loaded modules without forcing them to stay in memory,
   // removing patches is not safe.
 }