Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/wallpaper_source.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_CHROMEOS_WALLPAPER_SOURCE_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_WALLPAPER_SOURCE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 // A DataSource for chrome://wallpaper/ URL, provides current user's wallpaper.
 class WallpaperImageSource : public ChromeURLDataManager::DataSource {
  public:
   WallpaperImageSource();
 
   // ChromeURLDataManager::DataSource implementation.
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id) OVERRIDE;
@@ skipping 20 matching lines @@
   void SendCurrentUserWallpaper(int request_id,
                                 scoped_refptr<base::RefCountedBytes> data);
 
   scoped_refptr<WallpaperEncodingOperation> wallpaper_encoding_op_;
 
   base::WeakPtrFactory<WallpaperImageSource> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperImageSource);
 };
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_WALLPAPER_SOURCE_H_