[ChromeDriver] Add nested frame xpath expression in order to switch to frame present inside nested …

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 329 matching lines @@
   const base::DictionaryValue* id_dict;
   if (id->GetAsDictionary(&id_dict)) {
     script = "function(elem) { return elem; }";
     args.Append(id_dict->DeepCopy());
   } else {
     script =
         "function(xpath) {"
         "  return document.evaluate(xpath, document, null, "
         "      XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;"
         "}";
-    std::string xpath = "(/html/body//iframe|/html/frameset/frame)";
+    std::string xpath = "(/html/body//iframe|/html/frameset//frame)";
     std::string id_string;
     int id_int;
     if (id->GetAsString(&id_string)) {
       xpath += base::StringPrintf(
           "[@name=\"%s\" or @id=\"%s\"]", id_string.c_str(), id_string.c_str());
     } else if (id->GetAsInteger(&id_int)) {
       xpath += base::StringPrintf("[%d]", id_int + 1);
     } else {
       return Status(kUnknownError, "invalid 'id'");
     }
@@ skipping 692 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);
 }