Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / search_provider_logos / logo_tracker_unittest.cc

diff --git a/src/components/search_provider_logos/logo_tracker_unittest.cc b/src/components/search_provider_logos/logo_tracker_unittest.cc
index 0e889af..c32df2a 100644 (file)
--- a/src/components/search_provider_logos/logo_tracker_unittest.cc
+++ b/src/components/search_provider_logos/logo_tracker_unittest.cc
@@ -66,8 +66,7 @@ std::string EncodeBitmapAsPNGBase64(const SkBitmap& bitmap) {
 
 SkBitmap MakeBitmap(int width, int height) {
   SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  bitmap.allocPixels();
+  bitmap.allocN32Pixels(width, height);
   bitmap.eraseColor(SK_ColorBLUE);
   return bitmap;
 }
@@ -224,8 +223,8 @@ class MockLogoCache : public LogoCache {
   }
 
   virtual scoped_ptr<EncodedLogo> GetCachedLogo() OVERRIDE {
-    return make_scoped_ptr(logo_ ? new EncodedLogo(*logo_) : NULL);
     OnGetCachedLogo();
+    return make_scoped_ptr(logo_ ? new EncodedLogo(*logo_) : NULL);
   }
 
  private: