Add FormatOriginForSecurityDisplay which takes a const url::Origin& origin

components/url_formatter/elide_url.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 "components/url_formatter/elide_url.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
+#include "url/origin.h"
 #include "url/url_constants.h"
 
 #if !defined(OS_ANDROID)
 #include "ui/gfx/text_elider.h"  // nogncheck
 #include "ui/gfx/text_utils.h"  // nogncheck
 #endif
 
 namespace {
 
 #if !defined(OS_ANDROID)
@@ skipping 74 matching lines @@
   base::string16 kWwwPrefix = base::UTF8ToUTF16("www.");
   if (domain_start_index != base::string16::npos)
     *url_subdomain = url_host->substr(0, domain_start_index);
   if ((*url_subdomain == kWwwPrefix || url_subdomain->empty() ||
        url.SchemeIsFile())) {
     url_subdomain->clear();
   }
 }
 #endif  // !defined(OS_ANDROID)
 
-bool ShouldShowScheme(const GURL& url,
+bool ShouldShowScheme(const std::string& scheme,
                       const url_formatter::SchemeDisplay scheme_display) {
   switch (scheme_display) {
     case url_formatter::SchemeDisplay::SHOW:
       return true;
 
     case url_formatter::SchemeDisplay::OMIT_HTTP_AND_HTTPS:
-      return !url.SchemeIs(url::kHttpsScheme) &&
-             !url.SchemeIs(url::kHttpScheme);
+      return scheme != url::kHttpsScheme && scheme != url::kHttpScheme;
 
     case url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC:
-      return !url.SchemeIsCryptographic();
+      return scheme != url::kHttpsScheme && scheme != url::kWssScheme;
   }
 
   return true;
 }
 
 }  // namespace
 
 namespace url_formatter {
 
 #if !defined(OS_ANDROID)
@@ skipping 215 matching lines @@
     if (inner_url->SchemeIsFile()) {
       return base::ASCIIToUTF16(url::kFileSystemScheme) + colon +
              FormatUrlForSecurityDisplay(*inner_url) +
              base::UTF8ToUTF16(url.path());
     }
     return base::ASCIIToUTF16(url::kFileSystemScheme) + colon +
            FormatUrlForSecurityDisplay(*inner_url);
   }
 
   const GURL origin = url.GetOrigin();
   const std::string& scheme = origin.scheme();

[brettw, 2016/05/12 16:47:24]

While we're changing this, can you change these to be
  base::StringPiece scheme = origin.scheme_piece();
  base::StringPiece host = origin.host_piece();
and change ShouldShowScheme to take a StringPiece argument?

[juncai, 2016/05/12 17:29:06]

Done.

   const std::string& host = origin.host();
 
   base::string16 result;
-  if (ShouldShowScheme(url, scheme_display))
+  if (ShouldShowScheme(scheme, scheme_display))
     result = base::UTF8ToUTF16(scheme) + scheme_separator;
   result += base::UTF8ToUTF16(host);
 
   const int port = origin.IntPort();
   const int default_port = url::DefaultPortForScheme(
       scheme.c_str(), static_cast<int>(scheme.length()));
   if (port != url::PORT_UNSPECIFIED && port != default_port)
     result += colon + base::UTF8ToUTF16(origin.port());

[brettw, 2016/05/12 16:47:24]

Can you also change this to port_piece()?

[juncai, 2016/05/12 17:29:06]

Done.

 
   return result;
 }
 
+base::string16 FormatOriginForSecurityDisplay(
+    const url::Origin& origin,
+    const SchemeDisplay scheme_display) {
+  const std::string& scheme = origin.scheme();

[brettw, 2016/05/12 16:47:24]

Same, StringPiece, scheme_piece(), and host_piece()

[juncai, 2016/05/12 17:29:06]

url::Origin doesn't have scheme_piece(), and host_piece() member functions. So I
here just use:
base::StringPiece scheme = origin.scheme();
base::StringPiece host = origin.host();

Do you think it is ok?

[brettw, 2016/05/12 23:22:22]

Oh I see, these are const refs. This part is fine then.

+  const std::string& host = origin.host();
+  if (scheme.empty() && host.empty())
+    return base::string16();
+
+  const base::string16 colon(base::ASCIIToUTF16(":"));
+  const base::string16 scheme_separator(
+      base::ASCIIToUTF16(url::kStandardSchemeSeparator));
+
+  base::string16 result;
+  if (ShouldShowScheme(scheme, scheme_display))
+    result = base::UTF8ToUTF16(scheme) + scheme_separator;
+  result += base::UTF8ToUTF16(host);
+
+  int port = static_cast<int>(origin.port());
+  const int default_port = url::DefaultPortForScheme(
+      scheme.c_str(), static_cast<int>(scheme.length()));
+  if (port != 0 && port != default_port)
+    result += colon + base::UintToString16(origin.port());
+
+  return result;
+}
+
 }  // namespace url_formatter