Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/language_options_handler_common.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON_H_
 
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
-namespace options2 {
+namespace options {
 
 // The base class for language options page UI handlers.  This class has code
 // common to the Chrome OS and non-Chrome OS implementation of the handler.
 class LanguageOptionsHandlerCommon : public OptionsPageUIHandler {
  public:
   LanguageOptionsHandlerCommon();
   virtual ~LanguageOptionsHandlerCommon();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
@@ skipping 34 matching lines @@
   // |args| will contain the language code as string (ex. "fr").
   void UiLanguageChangeCallback(const base::ListValue* args);
 
   // Called when the spell check language is changed.
   // |args| will contain the language code as string (ex. "fr").
   void SpellCheckLanguageChangeCallback(const base::ListValue* args);
 
   DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandlerCommon);
 };
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_LANGUAGE_OPTIONS_HANDLER_COMMON_H_