Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/language_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/options2/language_options_handler.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 10 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::UserMetricsAction;
 
-namespace options2 {
+namespace options {
 
 LanguageOptionsHandler::LanguageOptionsHandler() {
 }
 
 LanguageOptionsHandler::~LanguageOptionsHandler() {
 }
 
 void LanguageOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   LanguageOptionsHandlerCommon::GetLocalizedValues(localized_strings);
@@ skipping 80 matching lines @@
     const std::string& language_code) {
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetString(prefs::kApplicationLocale, language_code);
 }
 
 void LanguageOptionsHandler::RestartCallback(const ListValue* args) {
   content::RecordAction(UserMetricsAction("LanguageOptions_Restart"));
   browser::AttemptRestart();
 }
 
-}  // namespace options2
+}  // namespace options