Rename raw_image() to image_bytes() in UserImage

components/wallpaper/wallpaper_manager_base.cc

 // Copyright 2014 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 "components/wallpaper/wallpaper_manager_base.h"
 
 #include <numeric>
 #include <vector>
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 896 matching lines @@
     return;
   }
 
   wallpaper.image().EnsureRepsForSupportedScales();
   scoped_ptr<gfx::ImageSkia> deep_copy(wallpaper.image().DeepCopy());
 
   scoped_ptr<bool> success(new bool(false));
   scoped_ptr<gfx::ImageSkia> small_wallpaper_image(new gfx::ImageSkia);
   scoped_ptr<gfx::ImageSkia> large_wallpaper_image(new gfx::ImageSkia);
 
-  // TODO(bshe): This may break if RawImage becomes RefCountedMemory.
+  // TODO(bshe): This may break if Bytes becomes RefCountedMemory.
   base::Closure resize_closure = base::Bind(
       &WallpaperManagerBase::ResizeCustomizedDefaultWallpaper,
-      base::Passed(&deep_copy), wallpaper.raw_image(),
+      base::Passed(&deep_copy), wallpaper.image_bytes(),
       base::Unretained(rescaled_files.get()), base::Unretained(success.get()),
       base::Unretained(small_wallpaper_image.get()),
       base::Unretained(large_wallpaper_image.get()));
   base::Closure on_resized_closure = base::Bind(
       &WallpaperManagerBase::OnCustomizedDefaultWallpaperResized,
       weak_factory_.GetWeakPtr(), wallpaper_url,
       base::Passed(std::move(rescaled_files)), base::Passed(std::move(success)),
       base::Passed(std::move(small_wallpaper_image)),
       base::Passed(std::move(large_wallpaper_image)));
 
   if (!task_runner_->PostTaskAndReply(FROM_HERE, resize_closure,
                                       on_resized_closure)) {
     LOG(WARNING) << "Failed to start Customized Wallpaper resize.";
   }
 }
 
 void WallpaperManagerBase::ResizeCustomizedDefaultWallpaper(
     scoped_ptr<gfx::ImageSkia> image,
-    const user_manager::UserImage::RawImage& raw_image,
+    const user_manager::UserImage::Bytes& image_bytes,
     const CustomizedWallpaperRescaledFiles* rescaled_files,
     bool* success,
     gfx::ImageSkia* small_wallpaper_image,
     gfx::ImageSkia* large_wallpaper_image) {
   *success = true;
 
   *success &= ResizeAndSaveWallpaper(
       *image, rescaled_files->path_rescaled_small(), WALLPAPER_LAYOUT_STRETCH,
       kSmallWallpaperMaxWidth, kSmallWallpaperMaxHeight, small_wallpaper_image);
 
@@ skipping 44 matching lines @@
 void WallpaperManagerBase::CreateSolidDefaultWallpaper() {
   loaded_wallpapers_for_test_++;
   SkBitmap bitmap;
   bitmap.allocN32Pixels(1, 1);
   bitmap.eraseColor(kDefaultWallpaperColor);
   const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   default_wallpaper_image_.reset(new user_manager::UserImage(image));
 }
 
 }  // namespace wallpaper