[Android History] Fix chrome://history redirect

chrome/browser/android/ntp/new_tab_page_url_handler.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 "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/url_constants.h"
 #include "url/gurl.h"
 
 namespace {
 const char kBookmarkFolderPath[] = "folder/";
 const char kLegacyWelcomeHost[] = "welcome";
 }
 
 namespace chrome {
 namespace android {
 
 bool HandleAndroidNativePageURL(GURL* url,
                                 content::BrowserContext* browser_context) {
   if (url->SchemeIs(content::kChromeUIScheme)) {
     // TODO(newt): stop redirecting chrome://welcome to chrome-native://newtab
     // when M39 is a distant memory. http://crbug.com/455427
     if (url->host() == chrome::kChromeUINewTabHost ||
         url->host() == kLegacyWelcomeHost) {
       *url = GURL(chrome::kChromeUINativeNewTabURL);
       return true;
     }
 
-    // TODO(twellington): stop redirecting chrome://bookmarks to
-    // chrome-native://bookmarks when M57 is a distant memory.
+    // TODO(twellington): stop redirecting chrome://history to
+    // chrome-native://history when M57 is a distant memory.
     // See http://crbug.com/654071.
-    if (base::FeatureList::IsEnabled(
-            chrome::android::kNativeAndroidHistoryManager) &&
+    if (base::FeatureList::IsEnabled(features::kNativeAndroidHistoryManager) &&
         (url->host() == kChromeUIHistoryHost ||
             url->host() == kChromeUIHistoryFrameHost)) {
-      *url = GURL(kChromeUINativeHistoryURL);
+      *url = GURL(content::kChromeUINativeHistoryURL);
       return true;
     }
 
     if (url->host() == kChromeUIPhysicalWebDiagnosticsHost) {
       *url = GURL(kChromeUINativePhysicalWebDiagnosticsURL);
       return true;
     }
   }
 
   if (url->SchemeIs(chrome::kChromeNativeScheme) &&
       url->host() == kChromeUIBookmarksHost) {
     std::string ref = url->ref();
     if (!ref.empty()) {
       *url = GURL(std::string(kChromeUINativeBookmarksURL)
                       .append(kBookmarkFolderPath)
                       .append(ref));
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace android
 }  // namespace chrome