Options: Rename options2 namespace to options.

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/download/download_shelf.h"
@@ skipping 115 matching lines @@
   NavigateParams params(GetSingletonTabNavigateParams(browser, GURL(url)));
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser, params);
 }
 
 void ShowContentSettings(Browser* browser,
                          ContentSettingsType content_settings_type) {
   ShowSettingsSubPage(
       browser,
       kContentSettingsExceptionsSubPage + std::string(kHashMark) +
-      options2::ContentSettingsHandler::ContentSettingsTypeToGroupName(
+      options::ContentSettingsHandler::ContentSettingsTypeToGroupName(
           content_settings_type));
 }
 
 void ShowClearBrowsingDataDialog(Browser* browser) {
   content::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"));
   ShowSettingsSubPage(browser, kClearBrowserDataSubPage);
 }
 
 void ShowPasswordManager(Browser* browser) {
   content::RecordAction(UserMetricsAction("Options_ShowPasswordManager"));
@@ skipping 37 matching lines @@
     NavigateParams params(GetSingletonTabNavigateParams(browser, GURL(url)));
     params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
     ShowSingletonTabOverwritingNTP(browser, params);
   } else {
     LoginUIServiceFactory::GetForProfile(
         browser->profile()->GetOriginalProfile())->ShowLoginUI(browser);
   }
 }
 
 }  // namespace chrome