[Android History] Fix chrome://history redirect

components/sessions/content/content_serialized_navigation_driver.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 "components/sessions/content/content_serialized_navigation_driver.h"
 
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/url_constants.h"
 
 namespace sessions {
 
 namespace {
 const int kObsoleteReferrerPolicyAlways = 0;
 const int kObsoleteReferrerPolicyDefault = 1;
 const int kObsoleteReferrerPolicyNever = 2;
@@ skipping 111 matching lines @@
 #if defined(OS_ANDROID)
   // Rewrite the old new tab and welcome page URLs to the new NTP URL.
   if (navigation->virtual_url_.SchemeIs(content::kChromeUIScheme) &&
       (navigation->virtual_url_.host_piece() == "welcome" ||
        navigation->virtual_url_.host_piece() == "newtab")) {
     navigation->virtual_url_ = GURL("chrome-native://newtab/");
     navigation->original_request_url_ = navigation->virtual_url_;
     navigation->encoded_page_state_ = content::PageState::CreateFromURL(
         navigation->virtual_url_).ToEncodedData();
   }
+
+  if (base::FeatureList::IsEnabled(features::kNativeAndroidHistoryManager) &&
+      navigation->virtual_url_.SchemeIs(content::kChromeUIScheme) &&
+      (navigation->virtual_url_.host_piece() == content::kChromeUIHistoryHost ||
+       navigation->virtual_url_.host_piece() == "history-frame")) {

[sky, 2017/02/06 22:32:14]

Is history-frame really not defined anywhere?

[Theresa, 2017/02/06 23:38:09]

It wasn't defined anywhere that was accessible by components/. I added it to
url_constants.h.

+    // Rewrite the old history Web UI to the new android native history.
+    navigation->virtual_url_ = GURL("chrome-native://history/");

[sky, 2017/02/06 22:32:14]

Seems like this should be constants, right?

[Theresa, 2017/02/06 23:38:09]

Done.

+    navigation->original_request_url_ = navigation->virtual_url_;
+    navigation->encoded_page_state_ = content::PageState::CreateFromURL(
+        navigation->virtual_url_).ToEncodedData();
+  } else if (
+      !base::FeatureList::IsEnabled(features::kNativeAndroidHistoryManager) &&
+      navigation->virtual_url_.SchemeIs("chrome-native") &&
+      navigation->virtual_url_.host_piece() == content::kChromeUIHistoryHost) {
+    // If the android native history UI has been disabled, redirect
+    // chrome-native://history to the old web UI.
+    navigation->virtual_url_ = GURL("chrome://history/");
+    navigation->original_request_url_ = navigation->virtual_url_;
+    navigation->encoded_page_state_ = std::string();
+  }
 #endif  // defined(OS_ANDROID)
 }
 
 std::string ContentSerializedNavigationDriver::StripReferrerFromPageState(
       const std::string& page_state) const {
   return content::PageState::CreateFromEncodedData(page_state)
       .RemoveReferrer()
       .ToEncodedData();
 }
 
 void ContentSerializedNavigationDriver::RegisterExtendedInfoHandler(
     const std::string& key,
     std::unique_ptr<ExtendedInfoHandler> handler) {
   DCHECK(!key.empty());
   DCHECK(!extended_info_handler_map_.count(key));
   DCHECK(handler.get());
   extended_info_handler_map_[key] = std::move(handler);
 }
 
 const ContentSerializedNavigationDriver::ExtendedInfoHandlerMap&
 ContentSerializedNavigationDriver::GetAllExtendedInfoHandlers() const {
   return extended_info_handler_map_;
 }
 
 }  // namespace sessions