Revert 50784 - Canvas refactoring part 3....

chrome/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2009 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 "base/basictypes.h"
 #include "base/keyboard_codes.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/renderer_host/backing_store.h"
 #include "chrome/browser/renderer_host/render_widget_host_painting_observer.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/common/render_messages.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
 
 using WebKit::WebInputEvent;
 using WebKit::WebMouseWheelEvent;
 
 namespace gfx {
 class Size;
 }
@@ skipping 373 matching lines @@
 }
 
 // Tests setting custom background
 TEST_F(RenderWidgetHostTest, Background) {
 #if defined(OS_WIN) || defined(OS_LINUX)
   scoped_ptr<RenderWidgetHostView> view(
       RenderWidgetHostView::CreateViewForWidget(host_.get()));
   host_->set_view(view.get());
 
   // Create a checkerboard background to test with.
-  gfx::CanvasSkia canvas(4, 4, true);
+  gfx::Canvas canvas(4, 4, true);
   canvas.FillRectInt(SK_ColorBLACK, 0, 0, 2, 2);
   canvas.FillRectInt(SK_ColorWHITE, 2, 0, 2, 2);
   canvas.FillRectInt(SK_ColorWHITE, 0, 2, 2, 2);
   canvas.FillRectInt(SK_ColorBLACK, 2, 2, 2, 2);
   const SkBitmap& background = canvas.getDevice()->accessBitmap(false);
 
   // Set the background and make sure we get back a copy.
   view->SetBackground(background);
   EXPECT_EQ(4, view->background().width());
   EXPECT_EQ(4, view->background().height());
@@ skipping 278 matching lines @@
   // Start it again to ensure it still works.
   EXPECT_FALSE(host_->unresponsive_timer_fired());
   host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
 
   // Wait long enough for first timeout and see if it fired.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new MessageLoop::QuitTask(), 10);
   MessageLoop::current()->Run();
   EXPECT_TRUE(host_->unresponsive_timer_fired());
 }