Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/web_contents/web_contents_view_aura_browsertest.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/web_contents/web_contents_view_aura.h"
 
 #include <stddef.h>
 #include <tuple>
 
 #include "base/command_line.h"
@@ skipping 118 matching lines @@
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
   }
 
   bool ScreenshotSetForEntry(NavigationEntryImpl* entry) const {
     return screenshot_set_.count(entry) > 0;
   }
 
  private:
   // Overridden from NavigationEntryScreenshotManager:
-  void TakeScreenshotImpl(RenderViewHost* host,
-                          NavigationEntryImpl* entry) override {
+  void WillTakeScreenshot(RenderViewHost* host) override {
     ++waiting_for_screenshots_;
     screenshot_taken_for_ = host;
-    NavigationEntryScreenshotManager::TakeScreenshotImpl(host, entry);
   }
 
   void OnScreenshotSet(NavigationEntryImpl* entry) override {
     --waiting_for_screenshots_;
     screenshot_set_[entry] = true;
     NavigationEntryScreenshotManager::OnScreenshotSet(entry);
     if (waiting_for_screenshots_ == 0 && message_loop_runner_.get())
       message_loop_runner_->Quit();
   }
 
@@ skipping 944 matching lines @@
     details = dispatcher->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_LT(0, tracker.num_overscroll_updates());
     EXPECT_FALSE(tracker.overscroll_completed());
   }
 }
 
 }  // namespace content