Extensions: Only display host name for the overridden home and start-up pages.

chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

 // Copyright 2013 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/extensions/manifest_handlers/settings_overrides_handler.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/strings/string_util.h"
@@ skipping 85 matching lines @@
     *error = extensions::ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidSearchEngineURL,
         *overrides->search_provider->favicon_url);
     return std::unique_ptr<ChromeSettingsOverrides::Search_provider>();
   }
   return std::move(overrides->search_provider);
 }
 
 // A www. prefix is not informative and thus not worth the limited real estate
 // in the permissions UI.
 std::string RemoveWwwPrefix(const std::string& url) {

[Devlin, 2017/02/07 18:39:24]

Optional nit: RemoveWwwPrefix is now only used from FormatUrlForDisplay - we
could just inline it.

[karandeepb, 2017/02/07 19:22:15]

Done.

   if (base::StartsWith(url, kWwwPrefix, base::CompareCase::INSENSITIVE_ASCII))
     return url.substr(strlen(kWwwPrefix));
   return url;
 }
 
+std::string FormatUrlForDisplay(const GURL& url) {
+  return RemoveWwwPrefix(url.host());

[Devlin, 2017/02/07 18:39:24]

Let's take the opportunity to make this a bit faster and use base::StringPieces
here (use GURL::host_piece() instead of host(), and, if you don't inline
RemoveWwwPrefix, have it take a base::StringPiece).

[karandeepb, 2017/02/07 19:22:15]

Done.

+}
+
 }  // namespace
 
 SettingsOverrides::SettingsOverrides() {}
 
 SettingsOverrides::~SettingsOverrides() {}
 
 // static
 const SettingsOverrides* SettingsOverrides::Get(
     const Extension* extension) {
   return static_cast<SettingsOverrides*>(
@@ skipping 19 matching lines @@
   info->startup_pages = ParseStartupPage(*settings, error);
   if (!info->homepage && !info->search_engine && info->startup_pages.empty()) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidEmptyDictionary,
         manifest_keys::kSettingsOverride);
     return false;
   }
 
   if (info->search_engine) {
     PermissionsParser::AddAPIPermission(
-        extension,
-        new SettingsOverrideAPIPermission(
-            PermissionsInfo::GetInstance()->GetByID(
-                APIPermission::kSearchProvider),
-            RemoveWwwPrefix(CreateManifestURL(info->search_engine->search_url)
-                                ->GetOrigin()
-                                .host())));
+        extension, new SettingsOverrideAPIPermission(
+                       PermissionsInfo::GetInstance()->GetByID(
+                           APIPermission::kSearchProvider),
+                       FormatUrlForDisplay(*CreateManifestURL(
+                           info->search_engine->search_url))));
   }
   if (!info->startup_pages.empty()) {
     PermissionsParser::AddAPIPermission(
         extension,
         new SettingsOverrideAPIPermission(
             PermissionsInfo::GetInstance()->GetByID(
                 APIPermission::kStartupPages),
             // We only support one startup page even though the type of the
-            // manifest
-            // property is a list, only the first one is used.
-            RemoveWwwPrefix(info->startup_pages[0].GetContent())));
+            // manifest property is a list, only the first one is used.
+            FormatUrlForDisplay(info->startup_pages[0])));
   }
   if (info->homepage) {
     PermissionsParser::AddAPIPermission(
         extension,
         new SettingsOverrideAPIPermission(
             PermissionsInfo::GetInstance()->GetByID(APIPermission::kHomepage),
-            RemoveWwwPrefix(info->homepage->GetContent())));
+            FormatUrlForDisplay(*(info->homepage))));
   }
   extension->SetManifestData(manifest_keys::kSettingsOverride,
                              info.release());
   return true;
 }
 
 const std::vector<std::string> SettingsOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kSettingsOverride);
 }
 
 }  // namespace extensions