Merge 275988 "Move about://-related constants from //content to ..."

android_webview/renderer/aw_content_renderer_client.cc

 // Copyright 2012 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 "android_webview/renderer/aw_content_renderer_client.h"
 
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/url_constants.h"
 #include "android_webview/renderer/aw_key_systems.h"
@@ skipping 79 matching lines @@
       || type == blink::WebNavigationTypeBackForward;
 
   // Don't offer application-initiated navigations unless it's a redirect.
   if (application_initiated && !is_redirect)
     return false;
 
   const GURL& gurl = request.url();
   // For HTTP schemes, only top-level navigations can be overridden. Similarly,
   // WebView Classic lets app override only top level about:blank navigations.
   // So we filter out non-top about:blank navigations here.
-  if (frame->parent() && (gurl.SchemeIs(url::kHttpScheme) ||
-                          gurl.SchemeIs(url::kHttpsScheme) ||
-                          gurl.SchemeIs(content::kAboutScheme)))
+  if (frame->parent() &&
+      (gurl.SchemeIs(url::kHttpScheme) || gurl.SchemeIs(url::kHttpsScheme) ||
+       gurl.SchemeIs(url::kAboutScheme)))
     return false;
 
   // use NavigationInterception throttle to handle the call as that can
   // be deferred until after the java side has been constructed.
   if (opener_id != MSG_ROUTING_NONE) {
     return false;
   }
 
   bool ignore_navigation = false;
   base::string16 url =  request.url().string();
@@ skipping 82 matching lines @@
 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
   return visited_link_slave_->IsVisited(link_hash);
 }
 
 void AwContentRendererClient::AddKeySystems(
     std::vector<content::KeySystemInfo>* key_systems) {
   AwAddKeySystems(key_systems);
 }
 
 }  // namespace android_webview