[chromedriver] Fallback to devtools for screenshotting of forbidden urls.

chrome/test/chromedriver/window_commands.cc

Index: chrome/test/chromedriver/window_commands.cc
diff --git a/chrome/test/chromedriver/window_commands.cc b/chrome/test/chromedriver/window_commands.cc
index cf376da0af1055c275c3b4d60fdad2b33a8c5d28..c1971098c77cc7fd8c20ddc3a9ee3395ccae2185 100644
--- a/chrome/test/chromedriver/window_commands.cc
+++ b/chrome/test/chromedriver/window_commands.cc
@@ -743,13 +743,15 @@ Status ExecuteScreenshot(
     if (status.IsError())
       return status;
     status = extension->CaptureScreenshot(&screenshot);
-    if (status.IsError())
-      return status;
-  } else {
-    Status status = web_view->CaptureScreenshot(&screenshot);
-    if (status.IsError())
+    // If the screenshot was forbidden, fallback to DevTools.
+    if (status.code() != kForbidden)
       return status;
   }
+
+  status = web_view->CaptureScreenshot(&screenshot);
+  if (status.IsError())
+    return status;
+
   value->reset(new base::StringValue(screenshot));
   return Status(kOk);
 }