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

chrome/browser/chromeos/login/existing_user_controller.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/login/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
+#include "chrome/common/net/url_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_auth_cache.h"
 #include "net/http/http_network_session.h"
@@ skipping 701 matching lines @@
 #if defined(NEW_GSG_URL)
 std::string ExistingUserController::GetGettingStartedGuideURL() const {
   GURL guide_url(kGetStartedURLPattern);
   std::string board;
   const char kMachineInfoBoard[] = "CHROMEOS_RELEASE_BOARD";
   system::StatisticsProvider* provider =
       system::StatisticsProvider::GetInstance();
   if (!provider->GetMachineStatistic(kMachineInfoBoard, &board))
     LOG(ERROR) << "Failed to get board information";
   if (!board.empty()) {
-    guide_url = chrome_browser_net::AppendQueryParameter(guide_url,
+    guide_url = chrome_common_net::AppendQueryParameter(guide_url,
                                                          kGetStartedBoardParam,
                                                          board);
   }
   if (is_owner_login_) {
-    guide_url = chrome_browser_net::AppendQueryParameter(
+    guide_url = chrome_common_net::AppendQueryParameter(
         guide_url,
         kGetStartedOwnerParam,
         kGetStartedOwnerParamValue);
   }
   guide_url = google_util::AppendGoogleLocaleParam(guide_url);
-  guide_url = chrome_browser_net::AppendQueryParameter(
+  guide_url = chrome_common_net::AppendQueryParameter(
       guide_url,
       kGetStartedInitialLocaleParam,
       WizardController::GetInitialLocale());
   return guide_url.spec();
 }
 #else
 std::string ExistingUserController::GetGettingStartedGuideURL() const {
   const char* url = kGetStartedURLPattern;
   PrefService* prefs = g_browser_process->local_state();
   const std::string current_locale =
@@ skipping 79 matching lines @@
   // Invalidate OAuth token, since it can't be correct after password is
   // changed.
   UserManager::Get()->SaveUserOAuthStatus(username,
                                           User::OAUTH_TOKEN_STATUS_INVALID);
 
   login_display_->SetUIEnabled(true);
   login_display_->ShowGaiaPasswordChanged(username);
 }
 
 }  // namespace chromeos