[chromedriver] Fix 3 bugs about web view, window handle and target window.

chrome/test/chromedriver/session.cc

 // Copyright (c) 2012 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/session.h"
 
 #include <list>
 
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
@@ skipping 25 matching lines @@
       script_timeout(0),
       capabilities(CreateCapabilities()) {
 }
 
 Session::~Session() {}
 
 Status Session::GetTargetWindow(WebView** web_view) {
   if (!chrome)
     return Status(kNoSuchWindow, "no chrome started in this session");
 
-  std::list<WebView*> web_views;
-  Status status = chrome->GetWebViews(&web_views);
+  Status status = chrome->GetWebViewById(window, web_view);
   if (status.IsError())
-    return status;
-
-  for (std::list<WebView*>::const_iterator it = web_views.begin();
-       it != web_views.end(); ++it) {
-    if ((*it)->GetId() == window) {
-      *web_view = *it;
-      return Status(kOk);
-    }
-  }
-  return Status(kNoSuchWindow, "target window already closed");
+    status = Status(kNoSuchWindow, "target window already closed", status);
+  return status;
 }
 
 void Session::SwitchToTopFrame() {
   frames.clear();
 }
 
 void Session::SwitchToSubFrame(const std::string& frame_id,
                                const std::string& chromedriver_frame_id) {
   std::string parent_frame_id;
   if (!frames.empty())
@@ skipping 30 matching lines @@
 
 SessionAccessorImpl::SessionAccessorImpl(scoped_ptr<Session> session)
     : session_(session.Pass()) {}
 
 Session* SessionAccessorImpl::Access(scoped_ptr<base::AutoLock>* lock) {
   lock->reset(new base::AutoLock(session_lock_));
   return session_.get();
 }
 
 SessionAccessorImpl::~SessionAccessorImpl() {}