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

chrome/browser/ui/toolbar/origin_chip_info.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/ui/toolbar/origin_chip_info.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
@@ skipping 13 matching lines @@
 #include "grit/chromium_strings.h"
 #include "grit/components_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
-// For selected kChromeUIScheme and kAboutScheme, return the string resource
+// For selected kChromeUIScheme and url::kAboutScheme, return the string
+// resource
 // number for the title of the page. If we don't have a specialized title,
 // returns -1.
 int StringForChromeHost(const GURL& url) {
   DCHECK(url.is_empty() || url.SchemeIs(content::kChromeUIScheme));
 
   if (url.is_empty())
     return IDS_NEW_TAB_TITLE;
 
   // TODO(gbillock): Just get the page title and special case exceptions?
   std::string host = url.host();
@@ skipping 125 matching lines @@
 base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
                                                   Profile* profile) {
   // First, strip view-source: if it appears.  Note that GetContent removes
   // "view-source:" but leaves the original scheme (http, https, ftp, etc).
   GURL url(provided_url);
   if (url.SchemeIs(content::kViewSourceScheme))
     url = GURL(url.GetContent());
 
   // About scheme pages. Currently all about: URLs other than about:blank
   // redirect to chrome: URLs, so this only affects about:blank.
-  if (url.SchemeIs(content::kAboutScheme))
+  if (url.SchemeIs(url::kAboutScheme))
     return base::UTF8ToUTF16(url.spec());
 
   // Chrome built-in pages.
   if (url.is_empty() || url.SchemeIs(content::kChromeUIScheme)) {
     int string_ref = StringForChromeHost(url);
     return l10n_util::GetStringUTF16(
         (string_ref == -1) ? IDS_SHORT_PRODUCT_NAME : string_ref);
   }
 
   // For chrome-extension URLs, return the extension name.
@@ skipping 56 matching lines @@
 
 #if defined(OS_CHROMEOS)
   if (url.SchemeIs(chrome::kCrosScheme) ||
       url.SchemeIs(chrome::kDriveScheme))
     return base::UTF8ToUTF16(url.spec());
 #endif
 
   // If all else fails, return the hostname.
   return base::UTF8ToUTF16(url.host());
 }