Componentize VersionInfo.

chrome/browser/history/chrome_history_backend_client.cc

 // Copyright 2015 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/history/chrome_history_backend_client.h"
 
 #include "chrome/common/chrome_version_info.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "url/gurl.h"
 
@@ skipping 46 matching lines @@
   for (const auto& url_and_title : url_and_titles) {
     history::URLAndTitle value = { url_and_title.url, url_and_title.title };
     bookmarks->push_back(value);
   }
 }
 
 bool ChromeHistoryBackendClient::ShouldReportDatabaseError() {
   // TODO(shess): For now, don't report on beta or stable so as not to
   // overwhelm the crash server.  Once the big fish are fried,
   // consider reporting at a reduced rate on the bigger channels.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  return channel != chrome::VersionInfo::CHANNEL_STABLE &&
-         channel != chrome::VersionInfo::CHANNEL_BETA;
+  version_info::Channel channel = chrome::VersionInfo::GetChannel();
+  return channel != version_info::Channel::STABLE &&
+         channel != version_info::Channel::BETA;
 }
 
 #if defined(OS_ANDROID)
 void ChromeHistoryBackendClient::OnHistoryBackendInitialized(
     history::HistoryBackend* history_backend,
     history::HistoryDatabase* history_database,
     history::ThumbnailDatabase* thumbnail_database,
     const base::FilePath& history_dir) {
   DCHECK(history_backend);
   if (thumbnail_database) {
     history_backend->SetUserData(
         history::AndroidProviderBackend::GetUserDataKey(),
         new history::AndroidProviderBackend(
             history_dir.Append(kAndroidCacheFilename), history_database,
             thumbnail_database, this, history_backend));
   }
 }
 
 void ChromeHistoryBackendClient::OnHistoryBackendDestroyed(
     history::HistoryBackend* history_backend,
     const base::FilePath& history_dir) {
   sql::Connection::Delete(history_dir.Append(kAndroidCacheFilename));
 }
 #endif  // defined(OS_ANDROID)