Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/browser_options_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_BROWSER_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/system/pointer_device_observer.h"
 #else
 #include "chrome/browser/prefs/pref_set_observer.h"
 #endif  // defined(OS_CHROMEOS)
 
 class AutocompleteController;
 class CloudPrintSetupHandler;
 class CustomHomePagesTableModel;
 class TemplateURLService;
 
-namespace options2 {
+namespace options {
 
 // Chrome browser options page UI handler.
 class BrowserOptionsHandler
     : public OptionsPageUIHandler,
       public CloudPrintSetupHandlerDelegate,
       public ProfileSyncServiceObserver,
       public ui::SelectFileDialog::Listener,
       public ShellIntegration::DefaultWebClientObserver,
 #if defined(OS_CHROMEOS)
       public chromeos::system::PointerDeviceObserver::Observer,
@@ skipping 272 matching lines @@
   IntegerPrefMember default_font_size_;
   DoublePrefMember default_zoom_level_;
 
 #if !defined(OS_CHROMEOS)
   scoped_ptr<PrefSetObserver> proxy_prefs_;
 #endif  // !defined(OS_CHROMEOS)
 
   DISALLOW_COPY_AND_ASSIGN(BrowserOptionsHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_BROWSER_OPTIONS_HANDLER_H_