Add suborigin logic to url::Origin

chrome/browser/browsing_data/cookies_tree_model.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/browser/browsing_data/cookies_tree_model.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
-#include "content/public/common/origin_util.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/ui_resources.h"
+#include "url/gurl.h"
+#include "url/origin.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "extensions/common/extension_set.h"
 #endif
 
 namespace {
 
 struct NodeTitleComparator {
   bool operator()(const std::unique_ptr<CookieTreeNode>& lhs,
@@ skipping 39 matching lines @@
   // are part of and should be visualized as part of that host. For example,
   // given a a suborigin 'foobar' at 'https://example.com', this is serialized
   // into the URL as 'https-so://foobar.example.com'. Thus, the host for this
   // URL is canonicalized as 'example.com' to treat it as being part of that
   // host, and thus the suborigin is striped from the URL.
   if (url.SchemeIsFile()) {
     return std::string(url::kFileScheme) +
            url::kStandardSchemeSeparator;
   }
 
-  std::string host = content::StripSuboriginFromUrl(url).host();
+  // Pass through url::Origin to get the real host, which has the effect of
+  // stripping the suborigin from the URL.
+  std::string host = url::Origin(url).host();
   std::string retval =
       net::registry_controlled_domains::GetDomainAndRegistry(
           host,
           net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
   if (!retval.length())  // Is an IP address or other special origin.
     return host;
 
   std::string::size_type position = host.rfind(retval);
 
   // The host may be the registry controlled domain, in which case fail fast.
@@ skipping 512 matching lines @@
   return DetailedInfo().Init(DetailedInfo::TYPE_ROOT);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieTreeHostNode, public:
 
 // static
 base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
   const std::string file_origin_node_name(
       std::string(url::kFileScheme) + url::kStandardSchemeSeparator);
-  return base::UTF8ToUTF16(url.SchemeIsFile()
-                               ? file_origin_node_name
-                               : content::StripSuboriginFromUrl(url).host());
+  return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
+                                              : url::Origin(url).host());
 }
 
 CookieTreeHostNode::CookieTreeHostNode(const GURL& url)
     : CookieTreeNode(TitleForUrl(url)),
       url_(url),
       canonicalized_host_(CanonicalizeHost(url)) {}
 
 CookieTreeHostNode::~CookieTreeHostNode() {}
 
 std::string CookieTreeHostNode::GetHost() const {
@@ skipping 887 matching lines @@
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (batches_ended_ == batches_started_ &&
       batches_seen_ == batches_expected_) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
     SetBatchExpectation(0, true);
   }
 }