[chromedriver] Don't overwrite extension snapshot.

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 <list>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 721 matching lines @@
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   Status status = session->chrome->ActivateWebView(web_view->GetId());
   if (status.IsError())
     return status;
 
   std::string screenshot;
   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;
 
   value->reset(new base::StringValue(screenshot));
   return Status(kOk);
 }
 
 Status ExecuteGetCookies(
     Session* session,
     WebView* web_view,
@@ skipping 90 matching lines @@
     // |accuracy| is not part of the WebDriver spec yet, so if it is not given
     // default to 100 meters accuracy.
     geoposition.accuracy = 100;
   }
 
   Status status = web_view->OverrideGeolocation(geoposition);
   if (status.IsOk())
     session->overridden_geoposition.reset(new Geoposition(geoposition));
   return status;
 }