google_apis: Move AppendQueryParameter() etc. from common/net/url_util.h to net/base/url_util.h

net/base/url_util.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/net/url_util.h"
+#include "net/base/url_util.h"
 
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/common/url_constants.h"
+#include "base/string_piece.h"
 #include "googleurl/src/gurl.h"
-#include "googleurl/src/url_parse.h"
 #include "net/base/escape.h"
-#include "net/base/net_util.h"
-#include "ui/base/clipboard/scoped_clipboard_writer.h"
 
-namespace chrome_common_net {
-
-void WriteURLToClipboard(const GURL& url,
-                         const std::string& languages,
-                         ui::Clipboard *clipboard) {
-  if (url.is_empty() || !url.is_valid() || !clipboard)
-    return;
-
-  // Unescaping path and query is not a good idea because other applications
-  // may not encode non-ASCII characters in UTF-8.  See crbug.com/2820.
-  string16 text = url.SchemeIs(chrome::kMailToScheme) ?
-      ASCIIToUTF16(url.path()) :
-      net::FormatUrl(url, languages, net::kFormatUrlOmitNothing,
-                     net::UnescapeRule::NONE, NULL, NULL, NULL);
-
-  ui::ScopedClipboardWriter scw(clipboard, ui::Clipboard::BUFFER_STANDARD);
-  scw.WriteURL(text);
-}
+namespace net {
 
 GURL AppendQueryParameter(const GURL& url,
                           const std::string& name,
                           const std::string& value) {
   std::string query(url.query());
 
   if (!query.empty())
     query += "&";
 
-  query += (net::EscapeQueryParamValue(name, true) + "=" +
-            net::EscapeQueryParamValue(value, true));
+  query += (EscapeQueryParamValue(name, true) + "=" +
+            EscapeQueryParamValue(value, true));
   GURL::Replacements replacements;
   replacements.SetQueryStr(query);
   return url.ReplaceComponents(replacements);
 }
 
 GURL AppendOrReplaceQueryParameter(const GURL& url,
                                    const std::string& name,
                                    const std::string& value) {
   bool replaced = false;
-  std::string param_name = net::EscapeQueryParamValue(name, true);
-  std::string param_value = net::EscapeQueryParamValue(value, true);
+  std::string param_name = EscapeQueryParamValue(name, true);
+  std::string param_value = EscapeQueryParamValue(value, true);
 
   const std::string input = url.query();
   url_parse::Component cursor(0, input.size());
   std::string output;
   url_parse::Component key_range, value_range;
   while (url_parse::ExtractQueryKeyValue(
              input.data(), &cursor, &key_range, &value_range)) {
     const base::StringPiece key(
         input.data() + key_range.begin, key_range.len);
     const base::StringPiece value(
@@ skipping 28 matching lines @@
                            const std::string& search_key,
                            std::string* out_value) {
   url_parse::Component query = url.parsed_for_possibly_invalid_spec().query;
   url_parse::Component key, value;
   while (url_parse::ExtractQueryKeyValue(
       url.spec().c_str(), &query, &key, &value)) {
     if (key.is_nonempty()) {
       std::string key_string = url.spec().substr(key.begin, key.len);
       if (key_string == search_key) {
         if (value.is_nonempty()) {
-          *out_value = net::UnescapeURLComponent(
+          *out_value = UnescapeURLComponent(
               url.spec().substr(value.begin, value.len),
-              net::UnescapeRule::SPACES |
-                  net::UnescapeRule::URL_SPECIAL_CHARS |
-                  net::UnescapeRule::REPLACE_PLUS_WITH_SPACE);
+              UnescapeRule::SPACES |
+              UnescapeRule::URL_SPECIAL_CHARS |
+              UnescapeRule::REPLACE_PLUS_WITH_SPACE);

[mmenke, 2013/01/28 16:01:02]

Did you deliberately reduce the indent here?

[tfarina, 2013/01/28 16:04:10]

Yes. I don't mind either style, but I prefer this one, since they are part of
the same mask.

[mmenke, 2013/01/28 16:05:35]

I prefer the old style, to make it clear they are part of the same argument, but
don't feel strong enough about it to fight over it.  :)

         } else {
           *out_value = "";
         }
         return true;
       }
     }
   }
   return false;
 }
 
-}  // namespace chrome_common_net
+}  // namespace net