Consistent CopyFromSurface() API, consolidated to RWHV

chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/ppapi/ppapi_test.h"
-#include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace {
 
 #if defined(OS_MACOSX)
 const bool kIsMacUI = true;
@@ skipping 211 matching lines @@
   }
 
   bool IsObservingActiveWebContents(content::WebContents* contents,
                                     bool expected_active_contents) const {
     return (contents == GetActiveWebContents()) == expected_active_contents;
   }
 
   bool IsObservingFlashFillColor(SkColor expected_color) const {
     content::RenderWidgetHostView* const flash_fs_view =
         GetActiveWebContents()->GetFullscreenRenderWidgetHostView();
-    content::RenderWidgetHost* const flash_fs_host =
-        flash_fs_view ? flash_fs_view->GetRenderWidgetHost() : nullptr;
-    if (!flash_fs_host) {
-      ADD_FAILURE() << "Flash fullscreen RenderWidgetHost is gone.";
+    if (!flash_fs_view) {
+      ADD_FAILURE() << "Flash fullscreen RenderWidgetHostView is gone.";
       return false;
     }
 
     // When a widget is first shown, it can take some time before it is ready
     // for copying from its backing store.  This is a transient condition, and
     // so it is not being treated as a test failure.
-    if (!flash_fs_host->CanCopyFromBackingStore())
+    if (!flash_fs_view->IsSurfaceAvailableForCopy())
       return false;
 
     // Copy and examine the upper-left pixel of the widget and compare it to the
     // |expected_color|.
     bool is_expected_color = false;
-    flash_fs_host->CopyFromBackingStore(
+    flash_fs_view->CopyFromSurface(
         gfx::Rect(0, 0, 1, 1), gfx::Size(1, 1),
         base::Bind(
             &FlashFullscreenInteractiveBrowserTest::CheckBitmapForFillColor,
             expected_color, &is_expected_color,
             base::MessageLoop::QuitWhenIdleClosure()),
         kN32_SkColorType);
     content::RunMessageLoop();
 
     return is_expected_color;
   }
@@ skipping 119 matching lines @@
   ASSERT_TRUE(ObserveFlashFillColor(SK_ColorRED));
   PressSpacebar();
   ASSERT_TRUE(ObserveFlashFillColor(SK_ColorBLUE));
 
   // Test that the Escape key is handled as an exit fullscreen command while the
   // Flash widget has the focus.
   EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true));
   PressEscape();
   EXPECT_TRUE(ObserveTabIsInFullscreen(false));
 }