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

chrome/test/chromedriver/commands.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/commands.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
@@ skipping 100 matching lines @@
 
     scoped_ptr<ChromeDesktopImpl> chrome_desktop(new ChromeDesktopImpl(
         context_getter, port, socket_factory));
     status = chrome_desktop->Launch(chrome_exe, args_list, extensions_list,
                                     prefs_dict, local_state_dict);
     chrome.reset(chrome_desktop.release());
   }
   if (status.IsError())
     return Status(kSessionNotCreatedException, status.message());
 
-  std::list<WebView*> web_views;
-  status = chrome->GetWebViews(&web_views);
-  if (status.IsError() || web_views.empty()) {
+  std::list<std::string> web_view_ids;
+  status = chrome->GetWebViewIds(&web_view_ids);
+  if (status.IsError() || web_view_ids.empty()) {
     chrome->Quit();
     return status.IsError() ? status :
         Status(kUnknownError, "unable to discover open window in chrome");
   }
-  WebView* default_web_view = web_views.front();
 
   std::string new_id = session_id;
   if (new_id.empty())
     new_id = GenerateId();
   scoped_ptr<Session> session(new Session(new_id, chrome.Pass()));
   if (!session->thread.Start()) {
     chrome->Quit();
     return Status(kUnknownError,
                   "failed to start a thread for the new session");
   }
-  session->window = default_web_view->GetId();
+  session->window = web_view_ids.front();
   out_value->reset(session->capabilities->DeepCopy());
   *out_session_id = new_id;
 
   scoped_refptr<SessionAccessor> accessor(
       new SessionAccessorImpl(session.Pass()));
   session_map->Set(new_id, accessor);
 
   return Status(kOk);
 }
 
 Status ExecuteQuitAll(
     Command quit_command,
     SessionMap* session_map,
     const base::DictionaryValue& params,
     const std::string& session_id,
     scoped_ptr<base::Value>* out_value,
     std::string* out_session_id) {
   std::vector<std::string> session_ids;
   session_map->GetKeys(&session_ids);
   for (size_t i = 0; i < session_ids.size(); ++i) {
     scoped_ptr<base::Value> unused_value;
     std::string unused_session_id;
     quit_command.Run(params, session_ids[i], &unused_value, &unused_session_id);
   }
   return Status(kOk);
 }