[chromedriver] Fix nested frame issue for command getElementLocationOnceScrolledIntoView.

Also enable two passed java tests.

BUG=
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/13870016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195036 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/chromedriver/element_commands.cc

@@ -371,13 +371,13 @@ Status ExecuteGetElementLocationOnceScrolledIntoView(
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
-  base::ListValue args;
-  args.Append(CreateElement(element_id));
-  return web_view->CallFunction(
-      session->GetCurrentFrameId(),
-      webdriver::atoms::asString(webdriver::atoms::GET_LOCATION_IN_VIEW),
-      args,
-      value);
+  WebPoint location;
+  Status status = ScrollElementIntoView(
+      session, web_view, element_id, &location);
+  if (status.IsError())
+    return status;
+  value->reset(CreateValueFrom(location));
+  return Status(kOk);
 }
 
 Status ExecuteGetElementSize(

chrome/test/chromedriver/element_util.cc

@@ -34,13 +34,6 @@ bool ParseFromValue(base::Value* value, WebPoint* point) {
   return true;
 }
 
-base::Value* CreateValueFrom(const WebPoint& point) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
-  dict->SetInteger("x", point.x);
-  dict->SetInteger("y", point.y);
-  return dict;
-}
-
 bool ParseFromValue(base::Value* value, WebSize* size) {
   base::DictionaryValue* dict_value;
   if (!value->GetAsDictionary(&dict_value))
@@ -219,6 +212,13 @@ base::DictionaryValue* CreateElement(const std::string& element_id) {
   return element;
 }
 
+base::Value* CreateValueFrom(const WebPoint& point) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
+  dict->SetInteger("x", point.x);
+  dict->SetInteger("y", point.y);
+  return dict;
+}
+
 Status FindElement(
     int interval_ms,
     bool only_one,

chrome/test/chromedriver/element_util.h

@@ -22,6 +22,8 @@ class WebView;
 
 base::DictionaryValue* CreateElement(const std::string& element_id);
 
+base::Value* CreateValueFrom(const WebPoint& point);
+
 // |root_element_id| could be null when no root element is given.
 Status FindElement(
     int interval_ms,

chrome/test/chromedriver/test_expectations

@@ -32,8 +32,6 @@ _REVISION_NEGATIVE_FILTER['HEAD'] = [
     'ClickTest.testCanClickOnALinkThatContainsEmbeddedBlockElements',
     'CombinedInputActionsTest.testClickingOnFormElements',
     'CombinedInputActionsTest.testHoldingDownShiftKeyWhileClicking',
-    'CoordinatesTest.testShouldGetCoordinatesInViewPortOfAnElementInAFrame',
-    'CoordinatesTest.testShouldGetCoordinatesInViewPortOfAnElementInANestedFrame',
     'CoordinatesTest.testShouldScrollPageAndGetCoordinatesOfAnElementThatIsOutOfViewPort',
     'CorrectEventFiringTest.testShouldEmitOnClickEventsWhenSelectingElements',
     'CorrectEventFiringTest.testShouldFireEventsInTheRightOrder',