Cleanup VersionInfo after componentization.

chrome/browser/ui/hung_plugin_tab_helper.cc

 // 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.
 
 #include "chrome/browser/ui/hung_plugin_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
 #include "base/rand_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/result_codes.h"
 #include "grit/theme_resources.h"
@@ skipping 318 matching lines @@
     }
   }
 }
 
 void HungPluginTabHelper::KillPlugin(int child_id) {
 #if defined(OS_WIN)
   // Dump renderers that are sending or receiving pepper messages, in order to
   // diagnose inter-process deadlocks.
   // Only do that on the Canary channel, for 20% of pepper plugin hangs.
   if (base::RandInt(0, 100) < 20) {
-    version_info::Channel channel = chrome::VersionInfo::GetChannel();
+    version_info::Channel channel = chrome::GetChannel();
     if (channel == version_info::Channel::CANARY) {
       scoped_ptr<OwnedHandleVector> renderer_handles(new OwnedHandleVector);
       HANDLE current_process = ::GetCurrentProcess();
       content::RenderProcessHost::iterator renderer_iter =
           content::RenderProcessHost::AllHostsIterator();
       for (; !renderer_iter.IsAtEnd(); renderer_iter.Advance()) {
         content::RenderProcessHost* host = renderer_iter.GetCurrentValue();
         HANDLE handle = NULL;
         ::DuplicateHandle(current_process, host->GetHandle(), current_process,
                           &handle, 0, FALSE, DUPLICATE_SAME_ACCESS);
@@ skipping 47 matching lines @@
 }
 
 void HungPluginTabHelper::CloseBar(PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (infobar_service && state->infobar) {
     infobar_service->RemoveInfoBar(state->infobar);
     state->infobar = NULL;
   }
 }