Componentize VersionInfo.

chrome/browser/apps/app_window_intercept_all_keys_uitest.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 "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/test/base/interactive_test_utils.h"
@@ skipping 202 matching lines @@
 #define MAYBE_InterceptDisabledByDefault DISABLED_InterceptDisabledByDefault
 #endif
 
 IN_PROC_BROWSER_TEST_F(AppWindowInterceptAllKeysTest,
                        MAYBE_InterceptDisabledByDefault) {
   ValidateCannotInterceptKeys(app_with_permission_, false, false);
 }
 
 // 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;
     EXPECT_NONFATAL_FAILURE(
         extension = LoadExtension(test_data_dir_.AppendASCII("platform_apps")
                                       .AppendASCII(app_with_permission_)),
         "");
 
     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";
   }
 }
 
 // Inject different keyboard combos and make sure that the app get them all.
 // Disabled test http://crbug.com/438209
 #if defined(OS_WIN)
 #define MAYBE_ValidateKeyEvent DISABLED_ValidateKeyEvent
 #else
 #define MAYBE_ValidateKeyEvent DISABLED_ValidateKeyEvent
@@ skipping 108 matching lines @@
           new ExtensionTestMessageListener(current_event->result[i], false));
     }
     ASSERT_TRUE(SimulateKeyPress(current_event->key, current_event->control,
                                  current_event->shift, current_event->alt,
                                  current_event->command));
     for (int i = 0; i < current_event->result_length; i++) {
       EXPECT_TRUE(listeners[i]->WaitUntilSatisfied());
     }
   }
 }