Options: Rename options2 namespace to options.

chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_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_thumbnail_source.h"
 
 #include "ash/desktop_background/desktop_background_resources.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/webui/web_ui_util.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/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace chromeos {
-namespace options2 {
+namespace options {
 
 class WallpaperThumbnailSource::ThumbnailEncodingOperation
   : public base::RefCountedThreadSafe<
         WallpaperThumbnailSource::ThumbnailEncodingOperation> {
  public:
   ThumbnailEncodingOperation(int request_id,
                              const chromeos::User* user,
                              ui::ScaleFactor scale_factor,
                              scoped_refptr<base::RefCountedBytes> data)
       : request_id_(request_id),
@@ skipping 208 matching lines @@
   int idr = PathToIDR(path);
   if (idr == -1) {
     SendResponse(request_id, NULL);
     return;
   }
   const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SendResponse(request_id,
                rb.LoadDataResourceBytes(idr, scale_factor));
 }
 
-}  // namespace options2
+}  // namespace options
 }  // namespace chromeos