Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/advanced_options_utils_x11.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.
 
 #if !defined(OS_CHROMEOS)
 
 #include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/nix/xdg_util.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
-namespace options2 {
+namespace options {
 
 // Command used to configure GNOME 2 proxy settings.
 const char* kGNOME2ProxyConfigCommand[] = {"gnome-network-properties", NULL};
 // In GNOME 3, we might need to run gnome-control-center instead. We try this
 // only after gnome-network-properties is not found, because older GNOME also
 // has this but it doesn't do the same thing. See below where we use it.
 const char* kGNOME3ProxyConfigCommand[] = {"gnome-control-center", "network",
                                            NULL};
 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure.
 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL};
@@ skipping 109 matching lines @@
 }  // anonymous namespace
 
 void AdvancedOptionsUtilities::ShowNetworkProxySettings(
     WebContents* web_contents) {
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&DetectAndStartProxyConfigUtil,
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetRenderViewHost()->GetRoutingID()));
 }
 
-}  // namespace options2
+}  // namespace options
 
 #endif  // !defined(OS_CHROMEOS)