Revert 273770 "Enable touch text selection tests on all Aura pla..."

trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.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 "content/browser/web_contents/touch_editable_impl_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 149 matching lines @@
   generator.GestureTapAt(gfx::Point(bounds.x() + 10, bounds.y() + 10));
   EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva);
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
   value->GetAsString(&selection);
 
   // Check if selection handles are showing.
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
-  EXPECT_EQ("Some text we can select", selection);
+  EXPECT_STREQ("Some text we can select", selection.c_str());
 
   // Lets move the handles a bit to modify the selection
   touch_editable->Reset();
   generator.GestureScrollSequence(
-      gfx::Point(bounds.x() + 10, bounds.y() + 47),
-      gfx::Point(bounds.x() + 30, bounds.y() + 47),
+      gfx::Point(10, 47),
+      gfx::Point(30, 47),
       base::TimeDelta::FromMilliseconds(20),
       5);
   touch_editable->WaitForSelectionChangeCallback();
 
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
   value = content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   value->GetAsString(&selection);
 
   // It is hard to tell what exactly the selection would be now. But it would
   // definitely be less than whatever was selected before.
@@ skipping 27 matching lines @@
   rwhva->OnGestureEvent(&long_press);
   touch_editable->WaitForSelectionChangeCallback();
 
   // Check if selection handles are showing.
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
   value->GetAsString(&selection);
-  EXPECT_EQ("Some", selection);
+  EXPECT_STREQ("Some", selection.c_str());
 
   // Start scrolling. Handles should get hidden.
   ui::GestureEvent scroll_begin(ui::ET_GESTURE_SCROLL_BEGIN,
                                 10,
                                 10,
                                 0,
                                 ui::EventTimeForNow(),
                                 ui::GestureEventDetails(
                                     ui::ET_GESTURE_SCROLL_BEGIN, 0, 0),
                                 1);
@@ skipping 40 matching lines @@
   rwhva->OnGestureEvent(&long_press);
   touch_editable->WaitForSelectionChangeCallback();
 
   // Check if selection handles are showing.
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
   value->GetAsString(&selection);
-  EXPECT_EQ("Some", selection);
+  EXPECT_STREQ("Some", selection.c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
                        TouchSelectionOnDoubleTapTest) {
   ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   RenderFrameHost* main_frame = web_contents->GetMainFrame();
   WebContentsViewAura* view_aura =
       static_cast<WebContentsViewAura*>(web_contents->GetView());
@@ skipping 15 matching lines @@
   rwhva->OnGestureEvent(&double_tap);
   touch_editable->WaitForSelectionChangeCallback();
 
   // Check if selection handles are showing.
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_selection()");
   std::string selection;
   value->GetAsString(&selection);
-#if defined(OS_WIN)
-  // In Windows, the default behavior is to select the whitespace after the word
-  // when the word is selected.
-  EXPECT_EQ("Some ", selection);
-#else
-  EXPECT_EQ("Some", selection);
-#endif  // defined (OS_WIN)
+  EXPECT_STREQ("Some", selection.c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest,
                        TouchCursorInTextfieldTest) {
   ASSERT_NO_FATAL_FAILURE(StartTestWithPage("files/touch_selection.html"));
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   RenderFrameHost* main_frame = web_contents->GetMainFrame();
   WebContentsViewAura* view_aura = static_cast<WebContentsViewAura*>(
       web_contents->GetView());
@@ skipping 22 matching lines @@
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_cursor_position()");
   int cursor_pos = -1;
   value->GetAsInteger(&cursor_pos);
   EXPECT_NE(-1, cursor_pos);
 
   // Move the cursor handle.
   generator.GestureScrollSequence(
-      gfx::Point(bounds.x() + 50, bounds.y() + 59),
-      gfx::Point(bounds.x() + 10, bounds.y() + 59),
+      gfx::Point(50, 59),
+      gfx::Point(10, 59),
       base::TimeDelta::FromMilliseconds(20),
       1);
   touch_editable->WaitForSelectionChangeCallback();
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
   value = content::ExecuteScriptAndGetValue(main_frame,
                                             "get_cursor_position()");
   int new_cursor_pos = -1;
   value->GetAsInteger(&new_cursor_pos);
   EXPECT_NE(-1, new_cursor_pos);
   // Cursor should have moved.
   EXPECT_NE(new_cursor_pos, cursor_pos);
 }
 
 }  // namespace content