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

chrome/test/chromedriver/chrome/chrome_impl.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/chrome/chrome_impl.h"
 
 #include <algorithm>
 #include <list>
 
 #include "base/bind.h"
@@ skipping 195 matching lines @@
       build_no_(0) {}
 
 ChromeImpl::~ChromeImpl() {
   web_view_map_.clear();
 }
 
 std::string ChromeImpl::GetVersion() {
   return version_;
 }
 
-Status ChromeImpl::GetWebViews(std::list<WebView*>* web_views) {
+Status ChromeImpl::GetWebViewIds(std::list<std::string>* web_view_ids) {
   WebViewInfoList info_list;
   Status status = FetchWebViewsInfo(
       context_getter_, port_, &info_list);
   if (status.IsError())
     return status;
 
-  std::list<WebView*> internal_web_views;
+  // Check if some web views are closed.
+  std::list<std::string>::iterator it = web_view_ids_.begin();
+  while (it != web_view_ids_.end()) {
+    if (!GetWebViewFromList(*it, info_list)) {
+      web_view_map_.erase(*it);
+      it = web_view_ids_.erase(it);
+    } else {
+      ++it;
+    }
+  }
+
+  // Check for newly-opened web views.
   for (WebViewInfoList::const_iterator it = info_list.begin();
        it != info_list.end(); ++it) {
-    WebViewMap::const_iterator found = web_view_map_.find(it->id);
-    if (found != web_view_map_.end()) {
-      internal_web_views.push_back(found->second.get());
+    if (it->type != internal::WebViewInfo::kPage)
       continue;
+
+    if (std::find(web_view_ids_.begin(), web_view_ids_.end(), it->id) ==
+        web_view_ids_.end()) {
+      web_view_ids_.push_back(it->id);
     }
-
-    std::string ws_url = base::StringPrintf(
-        "ws://127.0.0.1:%d/devtools/page/%s", port_, it->id.c_str());
-    DevToolsClientImpl::FrontendCloserFunc frontend_closer_func = base::Bind(
-        &CloseDevToolsFrontend, this, socket_factory_,
-        context_getter_, port_, it->id);
-    web_view_map_[it->id] = make_linked_ptr(new WebViewImpl(
-        it->id,
-        new DevToolsClientImpl(socket_factory_, ws_url, frontend_closer_func),
-        this,
-        base::Bind(&CloseWebView, context_getter_, port_, it->id)));
-    internal_web_views.push_back(web_view_map_[it->id].get());
   }
 
-  web_views->swap(internal_web_views);
+  *web_view_ids = web_view_ids_;
   return Status(kOk);
 }
 
+Status ChromeImpl::GetWebViewById(const std::string& id, WebView** web_view) {
+  WebViewMap::const_iterator found = web_view_map_.find(id);
+  if (found != web_view_map_.end()) {
+    *web_view = found->second.get();
+    return Status(kOk);
+  }
+
+  WebViewInfoList info_list;
+  Status status = FetchWebViewsInfo(context_getter_, port_, &info_list);
+  if (status.IsError())
+    return status;
+  for (WebViewInfoList::const_iterator it = info_list.begin();
+       it != info_list.end(); ++it) {
+    if (it->id == id && it->type == internal::WebViewInfo::kPage) {
+      std::string ws_url = base::StringPrintf(
+          "ws://127.0.0.1:%d/devtools/page/%s", port_, it->id.c_str());
+      DevToolsClientImpl::FrontendCloserFunc frontend_closer_func = base::Bind(
+          &CloseDevToolsFrontend, this, socket_factory_,
+          context_getter_, port_, it->id);
+      web_view_map_[it->id] = make_linked_ptr(new WebViewImpl(
+          it->id,
+          new DevToolsClientImpl(socket_factory_, ws_url, frontend_closer_func),
+          this,
+          base::Bind(&CloseWebView, context_getter_, port_, it->id)));
+      *web_view = web_view_map_[it->id].get();
+      return Status(kOk);
+    }
+  }
+  return Status(kUnknownError, "web view not found");
+}
+
 Status ChromeImpl::IsJavaScriptDialogOpen(bool* is_open) {
   JavaScriptDialogManager* manager;
   Status status = GetDialogManagerForOpenDialog(&manager);
   if (status.IsError())
     return status;
   *is_open = manager != NULL;
   return Status(kOk);
 }
 
 Status ChromeImpl::GetJavaScriptDialogMessage(std::string* message) {
@@ skipping 13 matching lines @@
   Status status = GetDialogManagerForOpenDialog(&manager);
   if (status.IsError())
     return status;
   if (!manager)
     return Status(kNoAlertOpen);
 
   return manager->HandleDialog(accept, prompt_text);
 }
 
 void ChromeImpl::OnWebViewClose(WebView* web_view) {
+  web_view_ids_.remove(web_view->GetId());
   web_view_map_.erase(web_view->GetId());
 }
 
 Status ChromeImpl::Init() {
   base::Time deadline = base::Time::Now() + base::TimeDelta::FromSeconds(20);
   std::string version;
   Status status(kOk);
   while (base::Time::Now() < deadline) {
     status = FetchVersionInfo(context_getter_, port_, &version);
     if (status.IsOk())
@@ skipping 18 matching lines @@
   }
   return Status(kUnknownError, "unable to discover open pages");
 }
 
 int ChromeImpl::GetPort() const {
   return port_;
 }
 
 Status ChromeImpl::GetDialogManagerForOpenDialog(
     JavaScriptDialogManager** manager) {
-  std::list<WebView*> web_views;
-  Status status = GetWebViews(&web_views);
+  std::list<std::string> web_view_ids;
+  Status status = GetWebViewIds(&web_view_ids);
   if (status.IsError())
     return status;
 
-  for (std::list<WebView*>::const_iterator it = web_views.begin();
-       it != web_views.end(); ++it) {
-    if ((*it)->GetJavaScriptDialogManager()->IsDialogOpen()) {
-      *manager = (*it)->GetJavaScriptDialogManager();
+  for (std::list<std::string>::const_iterator it = web_view_ids.begin();
+       it != web_view_ids.end(); ++it) {
+    WebView* web_view;
+    status = GetWebViewById(*it, &web_view);
+    if (status.IsError())
+      return status;
+    if (web_view->GetJavaScriptDialogManager()->IsDialogOpen()) {
+      *manager = web_view->GetJavaScriptDialogManager();
       return Status(kOk);
     }
   }
   *manager = NULL;
   return Status(kOk);
 }
 
 Status ChromeImpl::ParseAndCheckVersion(const std::string& version) {
   if (version.empty()) {
     // Content Shell has an empty product version and a fake user agent.
@@ skipping 84 matching lines @@
     return Status(kUnknownError, "version info not a dictionary");
   if (!dict->GetString("Browser", version)) {
     return Status(
         kUnknownError, "Chrome version must be >= 26",
         Status(kUnknownError, "version info doesn't include string 'Browser'"));
   }
   return Status(kOk);
 }
 
 }  // namespace internal