Remove skia::PlatformBitmap.

content/browser/media/capture/web_contents_video_capture_device_unittest.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 "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 255 matching lines @@
   }
 
   // TestRenderViewHost overrides.
   void CopyFromBackingStore(const gfx::Rect& src_rect,
                             const gfx::Size& accelerated_dst_size,
                             const ReadbackRequestCallback& callback,
                             const SkColorType color_type) override {
     gfx::Size size = controller_->GetCopyResultSize();
     SkColor color = controller_->GetSolidColor();
 
-    // Although it's not necessary, use a PlatformBitmap here (instead of a
-    // regular SkBitmap) to exercise possible threading issues.
-    skia::PlatformBitmap output;
-    EXPECT_TRUE(output.Allocate(size.width(), size.height(), false));
+    SkBitmap output;
+    EXPECT_TRUE(output.tryAllocN32Pixels(size.width(), size.height()));
     {
-      SkAutoLockPixels locker(output.GetBitmap());
-      output.GetBitmap().eraseColor(color);
+      SkAutoLockPixels locker(output);
+      output.eraseColor(color);
     }
-    callback.Run(output.GetBitmap(), content::READBACK_SUCCESS);
+    callback.Run(output, content::READBACK_SUCCESS);
     controller_->SignalCopy();
   }
 
  private:
   CaptureTestSourceController* controller_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(CaptureTestRenderViewHost);
 };
 
 #if defined(COMPILER_MSVC)
@@ skipping 838 matching lines @@
         policies[i], gfx::Size(1000, 1000), gfx::Size(1000, 1000));
     RunTestForPreferredSize(
         policies[i], gfx::Size(1600, 1000), gfx::Size(1600, 1000));
     RunTestForPreferredSize(
         policies[i], gfx::Size(837, 999), gfx::Size(837, 999));
   }
 }
 
 }  // namespace
 }  // namespace content