Consistent CopyFromSurface() API, consolidated to RWHV

chrome/browser/plugins/plugin_power_saver_browsertest.cc

 // Copyright 2015 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 <stdint.h>
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/zoom/zoom_controller.h"
 #include "content/public/browser/readback_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
+#include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/ppapi_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/window_open_disposition.h"
@@ skipping 318 matching lines @@
         base::FilePath(expected_filename));
 
     GetActiveWebContents()->GetMainFrame()->InsertVisualStateCallback(
         base::Bind(&VerifyVisualStateUpdated,
                    base::MessageLoop::QuitWhenIdleClosure()));
     content::RunMessageLoop();
 
     content::RenderWidgetHost* rwh =
         GetActiveWebContents()->GetRenderViewHost()->GetWidget();
 
-    if (!rwh->CanCopyFromBackingStore()) {
-      ADD_FAILURE() << "Could not copy from backing store.";
+    if (!rwh->GetView() || !rwh->GetView()->IsSurfaceAvailableForCopy()) {
+      ADD_FAILURE() << "RWHV surface not available for copy.";
       return false;
     }
 
     bool snapshot_matches = false;
-    rwh->CopyFromBackingStore(
+    rwh->GetView()->CopyFromSurface(
         gfx::Rect(), gfx::Size(),
         base::Bind(&CompareSnapshotToReference, reference, &snapshot_matches,
                    base::MessageLoop::QuitWhenIdleClosure()),
         kN32_SkColorType);
 
     content::RunMessageLoop();
 
     return snapshot_matches;
   }
 
@@ skipping 264 matching lines @@
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverPreferHtmlBrowserTest,
                        ThrottlePluginsOnAllowContentSetting) {
   HostContentSettingsMap* content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile());
 
   content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                                  CONTENT_SETTING_ALLOW);
   LoadPeripheralPlugin();
   VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
 }