[chromedriver] Don't overwrite extension snapshot.

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 c1971098c77cc7fd8c20ddc3a9ee3395ccae2185..997290e842edec00b49861ae58435d400c4ee5e0 100644
--- a/chrome/test/chromedriver/window_commands.cc
+++ b/chrome/test/chromedriver/window_commands.cc
@@ -739,16 +739,16 @@ Status ExecuteScreenshot(
   if (session->chrome->GetType() == Chrome::DESKTOP &&
       !session->force_devtools_screenshot) {
     AutomationExtension* extension = NULL;
-    Status status = session->chrome->GetAutomationExtension(&extension);
+    status = session->chrome->GetAutomationExtension(&extension);
     if (status.IsError())
       return status;
     status = extension->CaptureScreenshot(&screenshot);
     // If the screenshot was forbidden, fallback to DevTools.
-    if (status.code() != kForbidden)
-      return status;
+    if (status.code() == kForbidden)
+      status = web_view->CaptureScreenshot(&screenshot);
+  } else {
+    status = web_view->CaptureScreenshot(&screenshot);
   }
-
-  status = web_view->CaptureScreenshot(&screenshot);
   if (status.IsError())
     return status;