Componentize VersionInfo.

chrome/browser/password_manager/password_manager_browsertest.cc

 // Copyright 2013 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 <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
@@ skipping 1107 matching lines @@
   scoped_ptr<PromptObserver> prompt_observer(
       PromptObserver::Create(WebContents()));
   // Make sure that the only passwords saved are the auto-saved ones.
   std::string fill_and_submit =
       "document.getElementById('username_field').value = 'temp';"
       "document.getElementById('password_field').value = 'random';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
   if (chrome::VersionInfo::GetChannel() ==
-      chrome::VersionInfo::CHANNEL_UNKNOWN) {
+      version_info::Channel::UNKNOWN) {
     // Passwords getting auto-saved, no prompt.
     EXPECT_FALSE(prompt_observer->IsShowingPrompt());
     EXPECT_FALSE(password_store->IsEmpty());
   } else {
     // Prompt shown, and no passwords saved automatically.
     EXPECT_TRUE(prompt_observer->IsShowingPrompt());
     EXPECT_TRUE(password_store->IsEmpty());
   }
 }
 
@@ skipping 876 matching lines @@
       content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
 
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       iframe->GetProcess()->GetChannel(), illegal_forms_parsed);
 
   iframe_killed.Wait();
 }
 
 }  // namespace password_manager