Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/wallpaper_source.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/webui/options2/chromeos/wallpaper_source.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "base/debug/trace_event.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/ui_resources.h"
 #include "net/base/mime_util.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 
 extern "C" {
 #if defined(USE_SYSTEM_ZLIB)
 #include <zlib.h>
 #else
 #include "third_party/zlib/zlib.h"
 #endif
 }
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 // Operation class that encodes existing in-memory image as PNG.
 // It uses NO-COMPRESSION to save time.
 class WallpaperImageSource::WallpaperEncodingOperation
     : public base::RefCountedThreadSafe<
           WallpaperImageSource::WallpaperEncodingOperation> {
  public:
   WallpaperEncodingOperation(
       int request_id,
       scoped_refptr<base::RefCountedBytes> data,
@@ skipping 135 matching lines @@
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void WallpaperImageSource::SendCurrentUserWallpaper(int request_id,
     scoped_refptr<base::RefCountedBytes> data) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   SendResponse(request_id, data);
   TRACE_EVENT_ASYNC_END0("SCREEN_LOCK", "GetUserWallpaper", request_id);
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos