OOPIF support for layout test pixel dumps.

content/shell/test_runner/test_runner.cc

Index: content/shell/test_runner/test_runner.cc
diff --git a/content/shell/test_runner/test_runner.cc b/content/shell/test_runner/test_runner.cc
index e270fd729e59910a6c50c2036fb05aac1e65a6e7..2cb3a25b5aeadaa9155df613cd50d34b88d66ba8 100644
--- a/content/shell/test_runner/test_runner.cc
+++ b/content/shell/test_runner/test_runner.cc
@@ -53,6 +53,7 @@
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -1795,10 +1796,14 @@ void TestRunner::DumpPixelsAsync(
   if (layout_test_runtime_flags_.is_printing()) {
     test_runner::PrintFrameAsync(frame, std::move(callback));
   } else {
-    // TODO(lukasza): Ask the |delegate_| to capture the pixels in the browser
-    // process, so that OOPIF pixels are also captured.
-    test_runner::DumpPixelsAsync(frame, delegate_->GetDeviceScaleFactor(),
-                                 std::move(callback));
+    if (frame->FrameWidget()->GetPagePopup()) {
+      // TODO(lukasza): DO NOT SUBMIT: Can that also be handled by the browser
+      // process?
+      test_runner::DumpPixelsAsync(frame, delegate_->GetDeviceScaleFactor(),
+                                   std::move(callback));
+    } else {
+      delegate_->DumpPixelsAsync(std::move(callback));
+    }
   }
 }