Componentize VersionInfo.

chrome/browser/apps/app_window_intercept_all_keys_uitest.cc

Index: chrome/browser/apps/app_window_intercept_all_keys_uitest.cc
diff --git a/chrome/browser/apps/app_window_intercept_all_keys_uitest.cc b/chrome/browser/apps/app_window_intercept_all_keys_uitest.cc
index 6d61972d31f8e9467fe6dfd54089dd980b422d17..62157ff7fa2f0a490e48dbfab2995da1e96ca9ef 100644
--- a/chrome/browser/apps/app_window_intercept_all_keys_uitest.cc
+++ b/chrome/browser/apps/app_window_intercept_all_keys_uitest.cc
@@ -220,8 +220,8 @@ IN_PROC_BROWSER_TEST_F(AppWindowInterceptAllKeysTest,
 
 // Tests that the application cannot be loaded in stable.
 IN_PROC_BROWSER_TEST_F(AppWindowInterceptAllKeysTest, CannotLoadOtherThanDev) {
-  chrome::VersionInfo::Channel version_info[] = {
-      chrome::VersionInfo::CHANNEL_BETA, chrome::VersionInfo::CHANNEL_STABLE};
+  version_info::Channel version_info[] = {
+      version_info::Channel::BETA, version_info::Channel::STABLE};
   for (unsigned int index = 0; index < arraysize(version_info); index++) {
     extensions::ScopedCurrentChannel channel(version_info[index]);
     const extensions::Extension* extension = nullptr;
@@ -233,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowInterceptAllKeysTest, CannotLoadOtherThanDev) {
     DVLOG(1) << "Finished loading extension";
 
     ASSERT_TRUE(extension == nullptr) << "Application loaded in"
-                                      << version_info[index]
+                                      << static_cast<int>(version_info[index])
                                       << " while permission does not exist";
   }
 }