Moved url_utils from chrome/browser/net to chrome/common/net.

chrome/browser/chromeos/gdata/gdata_operations.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/chromeos/gdata/gdata_operations.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
-#include "chrome/browser/net/browser_url_util.h"
 #include "chrome/common/libxml_utils.h"
+#include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
-#include "chrome/common/net/gaia/gaia_urls.h"
+#include "chrome/common/net/url_util.h"
 #include "net/base/escape.h"
 #include "net/http/http_util.h"
 
 using content::BrowserThread;
 using content::URLFetcher;
 
 namespace {
 
 // Used for success ratio histograms. 0 for failure, 1 for success,
 // 2 for no connection (likely offline).
@@ skipping 54 matching lines @@
 
 // OAuth scope for the documents API.
 const char kDocsListScope[] = "https://docs.google.com/feeds/";
 const char kSpreadsheetsScope[] = "https://spreadsheets.google.com/feeds/";
 const char kUserContentScope[] = "https://docs.googleusercontent.com/";
 
 // Adds additional parameters for API version, output content type and to show
 // folders in the feed are added to document feed URLs.
 GURL AddStandardUrlParams(const GURL& url) {
   GURL result =
-      chrome_browser_net::AppendOrReplaceQueryParameter(url, "v", "3");
+      chrome_common_net::AppendOrReplaceQueryParameter(url, "v", "3");
   result =
-      chrome_browser_net::AppendOrReplaceQueryParameter(result, "alt", "json");
+      chrome_common_net::AppendOrReplaceQueryParameter(result, "alt", "json");
   return result;
 }
 
 // Adds additional parameters to metadata feed to include installed 3rd party
 // applications.
 GURL AddMetadataUrlParams(const GURL& url) {
   GURL result = AddStandardUrlParams(url);
-  result = chrome_browser_net::AppendOrReplaceQueryParameter(
+  result = chrome_common_net::AppendOrReplaceQueryParameter(
       result, "include-installed-apps", "true");
   return result;
 }
 
 // Adds additional parameters for API version, output content type and to show
 // folders in the feed are added to document feed URLs.
 GURL AddFeedUrlParams(const GURL& url,
                       int num_items_to_fetch,
                       int changestamp,
                       const std::string& search_string) {
   GURL result = AddStandardUrlParams(url);
-  result = chrome_browser_net::AppendOrReplaceQueryParameter(
+  result = chrome_common_net::AppendOrReplaceQueryParameter(
       result,
       "showfolders",
       "true");
-  result = chrome_browser_net::AppendOrReplaceQueryParameter(
+  result = chrome_common_net::AppendOrReplaceQueryParameter(
       result,
       "max-results",
       base::StringPrintf("%d", num_items_to_fetch));
-  result = chrome_browser_net::AppendOrReplaceQueryParameter(
+  result = chrome_common_net::AppendOrReplaceQueryParameter(
       result, "include-installed-apps", "true");
 
   if (changestamp) {
-    result = chrome_browser_net::AppendQueryParameter(
+    result = chrome_common_net::AppendQueryParameter(
         result,
         "start-index",
         base::StringPrintf("%d", changestamp));
   }
 
   if (!search_string.empty()) {
-    result = chrome_browser_net::AppendOrReplaceQueryParameter(
+    result = chrome_common_net::AppendOrReplaceQueryParameter(
         result, "q", search_string);
   }
   return result;
 }
 
 }  // namespace
 
 namespace gdata {
 
 //================================ AuthOperation ===============================
@@ skipping 684 matching lines @@
     GDataOperationRegistry* registry,
     Profile* profile,
     const InitiateUploadCallback& callback,
     const InitiateUploadParams& params)
     : UrlFetchOperationBase(registry,
                             GDataOperationRegistry::OPERATION_UPLOAD,
                             params.virtual_path,
                             profile),
       callback_(callback),
       params_(params),
-      initiate_upload_url_(chrome_browser_net::AppendOrReplaceQueryParameter(
+      initiate_upload_url_(chrome_common_net::AppendOrReplaceQueryParameter(
           params.resumable_create_media_link,
           kUploadParamConvertKey,
           kUploadParamConvertValue)) {
 }
 
 InitiateUploadOperation::~InitiateUploadOperation() {}
 
 GURL InitiateUploadOperation::GetURL() const {
   return initiate_upload_url_;
 }
@@ skipping 192 matching lines @@
   return true;
 }
 
 void ResumeUploadOperation::OnURLFetchUploadProgress(
     const content::URLFetcher* source, int64 current, int64 total) {
   // Adjust the progress values according to the range currently uploaded.
   NotifyProgress(params_.start_range + current, params_.content_length);
 }
 
 }  // namespace gdata