Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/content_settings_handler.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_CONTENT_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class HostContentSettingsMap;
 class ProtocolHandlerRegistry;
 
-namespace options2 {
+namespace options {
 
 class ContentSettingsHandler : public OptionsPageUIHandler,
                                public PepperFlashSettingsManager::Client {
  public:
   ContentSettingsHandler();
   virtual ~ContentSettingsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
@@ skipping 140 matching lines @@
   PrefChangeRegistrar pref_change_registrar_;
   scoped_ptr<PepperFlashSettingsManager> flash_settings_manager_;
   CachedPepperFlashSettings flash_cameramic_settings_;
 
   static const ExContentSettingsTypeNameEntry
       kExContentSettingsTypeGroupNames[];
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_