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

chrome/common/net/url_fixer_upper.cc

 // Copyright (c) 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 "chrome/common/net/url_fixer_upper.h"
 
 #include <algorithm>
 
 #if defined(OS_POSIX)
 #include "base/environment.h"
@@ skipping 411 matching lines @@
     }
     if (!found_scheme) {
       // Couldn't determine the scheme, so just pick one.
       parts->scheme.reset();
       scheme = StartsWithASCII(*text, "ftp.", false) ?
           url::kFtpScheme : url::kHttpScheme;
     }
   }
 
   // Proceed with about and chrome schemes, but not file or nonstandard schemes.
-  if ((scheme != content::kAboutScheme) &&
-      (scheme != content::kChromeUIScheme) &&
+  if ((scheme != url::kAboutScheme) && (scheme != content::kChromeUIScheme) &&
       ((scheme == url::kFileScheme) ||
-       !url::IsStandard(scheme.c_str(),
-                        url::Component(0,
-                                       static_cast<int>(scheme.length()))))) {
+       !url::IsStandard(
+           scheme.c_str(),
+           url::Component(0, static_cast<int>(scheme.length()))))) {
     return scheme;
   }
 
   if (scheme == url::kFileSystemScheme) {
     // Have the GURL parser do the heavy lifting for us.
     url::ParseFileSystemURL(text->data(), static_cast<int>(text->length()),
                             parts);
     return scheme;
   }
 
@@ skipping 80 matching lines @@
     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 
   // We handle the filesystem scheme separately.
   if (scheme == url::kFileSystemScheme) {
     if (parts.inner_parsed() && parts.inner_parsed()->scheme.is_valid())
       return GURL(text);
     return GURL();
   }
 
   // Parse and rebuild about: and chrome: URLs, except about:blank.
-  bool chrome_url = !LowerCaseEqualsASCII(trimmed, content::kAboutBlankURL) &&
-                    ((scheme == content::kAboutScheme) ||
-                     (scheme == content::kChromeUIScheme));
+  bool chrome_url =
+      !LowerCaseEqualsASCII(trimmed, url::kAboutBlankURL) &&
+      ((scheme == url::kAboutScheme) || (scheme == content::kChromeUIScheme));
 
   // For some schemes whose layouts we understand, we rebuild it.
   if (chrome_url ||
       url::IsStandard(scheme.c_str(),
                       url::Component(0, static_cast<int>(scheme.length())))) {
     // Replace the about: scheme with the chrome: scheme.
     std::string url(chrome_url ? content::kChromeUIScheme : scheme);
     url.append(url::kStandardSchemeSeparator);
 
     // We need to check whether the |username| is valid because it is our
@@ skipping 95 matching lines @@
 
   if (part->is_valid()) {
     // Offset the location of this component.
     part->begin += offset;
 
     // This part might not have existed in the original text.
     if (part->begin < 0)
       part->reset();
   }
 }