get rid of old options pages

chrome/browser/ui/webui/sync_promo/sync_promo_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/sync_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
-#include "chrome/browser/ui/webui/options/core_options_handler.h"
+#include "chrome/browser/ui/webui/options2/core_options_handler2.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_handler.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/url_util.h"
 #include "grit/browser_resources.h"
@@ skipping 42 matching lines @@
   explicit SyncPromoUIHTMLSource(content::WebUI* web_ui);
 
  private:
   ~SyncPromoUIHTMLSource() {}
   DISALLOW_COPY_AND_ASSIGN(SyncPromoUIHTMLSource);
 };
 
 SyncPromoUIHTMLSource::SyncPromoUIHTMLSource(content::WebUI* web_ui)
     : ChromeWebUIDataSource(chrome::kChromeUISyncPromoHost) {
   DictionaryValue localized_strings;
-  CoreOptionsHandler::GetStaticLocalizedValues(&localized_strings);
+  options2::CoreOptionsHandler::GetStaticLocalizedValues(&localized_strings);
   SyncSetupHandler::GetStaticLocalizedValues(&localized_strings, web_ui);
   AddLocalizedStrings(localized_strings);
 }
 
 // Looks for |search_key| in the query portion of |url|. Returns true if the
 // key is found and sets |out_value| to the value for the key. Returns false if
 // the key is not found.
 bool GetValueForKeyInQuery(const GURL& url, const std::string& search_key,
                            std::string* out_value) {
   url_parse::Component query = url.parsed_for_possibly_invalid_spec().query;
@@ skipping 181 matching lines @@
   }
   return GURL();
 }
 
 // static
 std::string SyncPromoUI::GetSourceForSyncPromoURL(const GURL& url) {
   std::string value;
   return GetValueForKeyInQuery(url, kSyncPromoQueryKeySource, &value) ?
       value : std::string();
 }