get rid of old options pages

chrome/browser/ui/webui/chromeos/proxy_settings_ui.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/chromeos/proxy_settings_ui.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"
-#include "chrome/browser/ui/webui/options/chromeos/proxy_handler.h"
+#include "chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h"
+#include "chrome/browser/ui/webui/options2/chromeos/proxy_handler2.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ skipping 38 matching lines @@
 
   SendResponse(request_id, base::RefCountedString::TakeString(&full_html));
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ProxySettingsUI::ProxySettingsUI(content::WebUI* web_ui)
     : WebUIController(web_ui),
-      proxy_handler_(new ProxyHandler()),
-      core_handler_(new CoreChromeOSOptionsHandler()) {
+      proxy_handler_(new options2::ProxyHandler()),
+      core_handler_(new options2::CoreChromeOSOptionsHandler()) {
   // |localized_strings| will be owned by ProxySettingsHTMLSource.
   DictionaryValue* localized_strings = new DictionaryValue();
 
   core_handler_->set_handlers_host(this);
   core_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(core_handler_);
 
   proxy_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(proxy_handler_);
 
@@ skipping 17 matching lines @@
   proxy_handler_->InitializePage();
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
   proxy_tracker->UIMakeActiveNetworkCurrent();
   std::string network_name;
   proxy_tracker->UIGetCurrentNetworkName(&network_name);
   proxy_handler_->SetNetworkName(network_name);
 }
 
 }  // namespace chromeos