[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 41 matching lines @@
 #include "public/web/WebCache.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebPluginParams.h"
 #include "public/web/WebPrintParams.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
+#include "skia/ext/cdl_picture_recorder.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FakeWebPlugin.h"
 #include "web/tests/FrameTestHelpers.h"
 #include <memory>
 
 using blink::testing::runPendingTasks;
 
 namespace blink {
@@ skipping 177 matching lines @@
   DCHECK(webView);
   webView->updateAllLifecyclePhases();
   runPendingTasks();
   WebFrame* frame = webView->mainFrame();
 
   WebPrintParams printParams;
   printParams.printContentArea.width = 500;
   printParams.printContentArea.height = 500;
 
   frame->printBegin(printParams);
-  SkPictureRecorder recorder;
+  CdlPictureRecorder recorder;
   frame->printPage(0, recorder.beginRecording(IntRect()));
   frame->printEnd();
   DCHECK(pluginWebFrameClient.printedAtLeastOnePage());
 }
 
 TEST_F(WebPluginContainerTest, PrintAllPages) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("test.pdf"),
       WebString::fromUTF8("application/pdf"));
 
   TestPluginWebFrameClient pluginWebFrameClient;  // Must outlive webViewHelper.
   FrameTestHelpers::WebViewHelper webViewHelper;
   WebView* webView = webViewHelper.initializeAndLoad(
       m_baseURL + "test.pdf", true, &pluginWebFrameClient);
   DCHECK(webView);
   webView->updateAllLifecyclePhases();
   runPendingTasks();
   WebFrame* frame = webView->mainFrame();
 
   WebPrintParams printParams;
   printParams.printContentArea.width = 500;
   printParams.printContentArea.height = 500;
 
   frame->printBegin(printParams);
-  SkPictureRecorder recorder;
+  CdlPictureRecorder recorder;
   frame->printPagesWithBoundaries(recorder.beginRecording(IntRect()),
                                   WebSize());
   frame->printEnd();
   DCHECK(pluginWebFrameClient.printedAtLeastOnePage());
 }
 
 TEST_F(WebPluginContainerTest, LocalToWindowPointTest) {
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("plugin_container.html"));
@@ skipping 477 matching lines @@
           WebString::fromUTF8("translated-plugin"));
   pluginContainerOneElement.pluginContainer()->setWantsWheelEvents(true);
 
   runPendingTasks();
   EXPECT_TRUE(
       webView->page()->frameHost().eventHandlerRegistry().hasEventHandlers(
           EventHandlerRegistry::WheelEventBlocking));
 }
 
 }  // namespace blink