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

chrome/browser/chromeos/cros/network_library.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/cros/network_library.h"
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"  // for debug output only.
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversion_utils.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/certificate_pattern.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/native_network_constants.h"
 #include "chrome/browser/chromeos/cros/native_network_parser.h"
 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h"
 #include "chrome/browser/chromeos/cros/network_library_impl_stub.h"
-#include "chrome/common/net/url_util.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "chromeos/network/cros_network_functions.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
+#include "net/base/url_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation notes.
 // NetworkLibraryImpl manages a series of classes that describe network devices
 // and services:
 //
@@ skipping 865 matching lines @@
 bool CellularNetwork::NeedsActivation() const {
   return (activation_state() != ACTIVATION_STATE_ACTIVATED &&
           activation_state() != ACTIVATION_STATE_UNKNOWN);
 }
 
 GURL CellularNetwork::GetAccountInfoUrl() const {
   if (!post_data_.length())
     return GURL(payment_url());
 
   GURL base_url(kRedirectExtensionPage);
-  GURL temp_url = chrome_common_net::AppendQueryParameter(base_url,
-                                                           "post_data",
-                                                           post_data_);
-  GURL redir_url = chrome_common_net::AppendQueryParameter(temp_url,
-                                                            "formUrl",
-                                                            payment_url());
+  GURL temp_url = net::AppendQueryParameter(base_url,
+                                            "post_data",
+                                            post_data_);
+  GURL redir_url = net::AppendQueryParameter(temp_url,
+                                             "formUrl",
+                                             payment_url());
   return redir_url;
 }
 
 std::string CellularNetwork::GetNetworkTechnologyString() const {
   // No need to localize these cellular technology abbreviations.
   switch (network_technology_) {
     case NETWORK_TECHNOLOGY_1XRTT:
       return "1xRTT";
       break;
     case NETWORK_TECHNOLOGY_EVDO:
@@ skipping 452 matching lines @@
   NetworkLibrary* impl;
   if (stub)
     impl = new NetworkLibraryImplStub();
   else
     impl = new NetworkLibraryImplCros();
   impl->Init();
   return impl;
 }
 
 }  // namespace chromeos