Cleanup: Move kChromeUIScheme constant into content namespace.

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 407 matching lines @@
     }
     if (!found_scheme) {
       // Couldn't determine the scheme, so just pick one.
       parts->scheme.reset();
       scheme.assign(StartsWithASCII(*text, "ftp.", false) ?
                     content::kFtpScheme : content::kHttpScheme);
     }
   }
 
   // Proceed with about and chrome schemes, but not file or nonstandard schemes.
-  if ((scheme != chrome::kAboutScheme) && (scheme != chrome::kChromeUIScheme) &&
-      ((scheme == content::kFileScheme) || !url_util::IsStandard(scheme.c_str(),
-           url_parse::Component(0, static_cast<int>(scheme.length())))))
+  if ((scheme != chrome::kAboutScheme) &&
+      (scheme != content::kChromeUIScheme) &&
+      ((scheme == content::kFileScheme) ||
+       !url_util::IsStandard(
+            scheme.c_str(),
+            url_parse::Component(0, static_cast<int>(scheme.length())))))
     return scheme;
 
   if (scheme == content::kFileSystemScheme) {
     // Have the GURL parser do the heavy lifting for us.
     url_parse::ParseFileSystemURL(text->data(),
         static_cast<int>(text->length()), parts);
     return scheme;
   }
 
   if (parts->scheme.is_valid()) {
@@ skipping 81 matching lines @@
 
   // We handle the filesystem scheme separately.
   if (scheme == content::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 == chrome::kAboutScheme) || (scheme == chrome::kChromeUIScheme));
+                    ((scheme == chrome::kAboutScheme) ||
+                     (scheme == content::kChromeUIScheme));
 
   // For some schemes whose layouts we understand, we rebuild it.
   if (chrome_url || url_util::IsStandard(scheme.c_str(),
           url_parse::Component(0, static_cast<int>(scheme.length())))) {
     // Replace the about: scheme with the chrome: scheme.
-    std::string url(chrome_url ? chrome::kChromeUIScheme : scheme);
+    std::string url(chrome_url ? content::kChromeUIScheme : scheme);
     url.append(content::kStandardSchemeSeparator);
 
     // We need to check whether the |username| is valid because it is our
     // responsibility to append the '@' to delineate the user information from
     // the host portion of the URL.
     if (parts.username.is_valid()) {
       FixupUsername(trimmed, parts.username, &url);
       FixupPassword(trimmed, parts.password, &url);
       url.append("@");
     }
@@ skipping 88 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();
   }
 }