Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/startup_pages_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_STARTUP_PAGES_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_STARTUP_PAGES_HANDLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 class AutocompleteController;
 class CustomHomePagesTableModel;
 class TemplateURLService;
 
-namespace options2 {
+namespace options {
 
 // Chrome browser options page UI handler.
 class StartupPagesHandler : public OptionsPageUIHandler,
                             public AutocompleteControllerDelegate,
                             public ui::TableModelObserver {
  public:
   StartupPagesHandler();
   virtual ~StartupPagesHandler();
 
   // OptionsPageUIHandler implementation.
@@ skipping 57 matching lines @@
   PrefChangeRegistrar pref_change_registrar_;
 
   // TODO(stuartmorgan): Once there are no other clients of
   // CustomHomePagesTableModel, consider changing it to something more like
   // TemplateURLService.
   scoped_ptr<CustomHomePagesTableModel> startup_custom_pages_table_model_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupPagesHandler);
 };
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_STARTUP_PAGES_HANDLER_H_