Revert of Move net::FormatUrl and friends outside of //net and into //components

chrome/browser/ui/webui/options/core_options_handler.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/ui/webui/options/core_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
-#include "components/url_formatter/url_fixer.h"
+#include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "grit/components_strings.h"
@@ skipping 531 matching lines @@
         NOTREACHED();
         return;
       }
       break;
     case TYPE_URL: {
       std::string original;
       if (!value->GetAsString(&original)) {
         NOTREACHED();
         return;
       }
-      GURL fixed = url_formatter::FixupURL(original, std::string());
+      GURL fixed = url_fixer::FixupURL(original, std::string());
       temp_value.reset(new base::StringValue(fixed.spec()));
       value = temp_value.get();
       break;
     }
     case TYPE_LIST: {
       // In case we have a List pref we got a JSON string.
       std::string json_string;
       if (!value->GetAsString(&json_string)) {
         NOTREACHED();
         return;
@@ skipping 63 matching lines @@
           plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
   web_ui()->CallJavascriptFunction(
       "options.OptionsPage.setPepperFlashSettingsEnabled", enabled);
 }
 
 bool CoreOptionsHandler::IsUserUnsupervised(const base::Value* to_value) {
   return !Profile::FromWebUI(web_ui())->IsSupervised();
 }
 
 }  // namespace options