Move referrer stripping into GURL::GetAsReferrer().

url/gurl.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.
 
 #ifdef WIN32
 #include <windows.h>
 #else
 #include <pthread.h>
 #endif
 
@@ skipping 302 matching lines @@
   url_canon::Replacements<char> replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.ClearPath();
   replacements.ClearQuery();
   replacements.ClearRef();
 
   return ReplaceComponents(replacements);
 }
 
+GURL GURL::GetAsReferrer() const {
+  if (!is_valid_ ||
+        (!has_ref() && !has_username() && !has_password()))

[brettw, 2014/03/07 18:08:10]

You can just put the first ( on this line right under the ! on the previous
line.

[ppi, 2014/03/13 19:33:24]

Done.

+    return GURL(*this);
+
+  url_canon::Replacements<char> replacements;
+  replacements.ClearRef();
+  replacements.ClearUsername();
+  replacements.ClearPassword();
+  return ReplaceComponents(replacements);
+}
+
 GURL GURL::GetWithEmptyPath() const {
   // This doesn't make sense for invalid or nonstandard URLs, so return
   // the empty URL.
   if (!is_valid_ || !IsStandard())
     return GURL();
 
   // We could optimize this since we know that the URL is canonical, and we are
   // appending a canonical path, so avoiding re-parsing.
   GURL other(*this);
   if (parsed_.path.len == 0)
@@ skipping 176 matching lines @@
 void GURL::Swap(GURL* other) {
   spec_.swap(other->spec_);
   std::swap(is_valid_, other->is_valid_);
   std::swap(parsed_, other->parsed_);
   inner_url_.swap(other->inner_url_);
 }
 
 std::ostream& operator<<(std::ostream& out, const GURL& url) {
   return out << url.possibly_invalid_spec();
 }