[chromedriver] Retry screenshots on Android.

chrome/test/chromedriver/window_commands.cc

 // Copyright (c) 2013 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 "chrome/test/chromedriver/window_commands.h"
 
 #include <stddef.h>
 
 #include <list>
 #include <string>
@@ skipping 834 matching lines @@
 
   std::string screenshot;
   ChromeDesktopImpl* desktop = NULL;
   status = session->chrome->GetAsDesktop(&desktop);
   if (status.IsOk() && !session->force_devtools_screenshot) {
     AutomationExtension* extension = NULL;
     status = desktop->GetAutomationExtension(&extension);
     if (status.IsError())
       return status;
     status = extension->CaptureScreenshot(&screenshot);
-    if (status.IsError()) {
-      LOG(WARNING) << "screenshot failed with extension, fallback to DevTools";
-      status = web_view->CaptureScreenshot(&screenshot);
-    }
   } else {
     status = web_view->CaptureScreenshot(&screenshot);
   }
+  if (status.IsError()) {
+    LOG(WARNING) << "screenshot failed, retrying";
+    status = web_view->CaptureScreenshot(&screenshot);
+  }
   if (status.IsError())
     return status;
 
   value->reset(new base::StringValue(screenshot));
   return Status(kOk);
 }
 
 Status ExecuteGetCookies(
     Session* session,
     WebView* web_view,
@@ skipping 181 matching lines @@
   return status;
 }
 
 Status ExecuteTakeHeapSnapshot(
     Session* session,
     WebView* web_view,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   return web_view->TakeHeapSnapshot(value);
 }