Cleanup VersionInfo after componentization.

chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc

Index: chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
index bccd39b75510dc7b40f90574041c1a0deabec5a0..eb22e9a7211632490ddf95a3793c41d3e3576eb8 100644
--- a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
@@ -5,7 +5,8 @@
 #include "base/command_line.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
+#include "components/version_info/version_info.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/media_switches.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -13,18 +14,16 @@
 static const char kMainWebrtcTestHtmlPage[] =
     "/webrtc/webrtc_jsep01_test.html";
 
-using chrome::VersionInfo;
-
 // This tests the --disable-webrtc-encryption command line flag. Disabling
 // encryption should only be possible on certain channels.
 
 // NOTE: The test case for each channel will only be exercised when the browser
 // is actually built for that channel. This is not ideal. One can test manually
-// by e.g. faking the channel returned in VersionInfo::GetChannel(). It's
-// likely good to have the test anyway, even though a failure might not be
-// detected until a branch has been promoted to another channel. The unit
-// test for ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch
-// tests for all channels however.
+// by e.g. faking the channel returned in chrome::GetChannel(). It's likely good
+// to have the test anyway, even though a failure might not be detected until a
+// branch has been promoted to another channel. The unit test for
+// ChromeContentBrowserClient::MaybeCopyDisableWebRtcEncryptionSwitch tests for
+// all channels however.
 // TODO(grunell): Test the different channel cases for any build.
 class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase {
  public:
@@ -72,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest,
   WaitForVideoToPlay(right_tab);
 
   bool should_detect_encryption = true;
-  version_info::Channel channel = VersionInfo::GetChannel();
+  version_info::Channel channel = chrome::GetChannel();
   if (channel == version_info::Channel::UNKNOWN ||
       channel == version_info::Channel::CANARY ||
       channel == version_info::Channel::DEV) {