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

trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc

Index: trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc
===================================================================
--- trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc	(revision 273804)
+++ trunk/src/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc	(working copy)
@@ -167,13 +167,13 @@
 
   // 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();
@@ -221,7 +221,7 @@
       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,
@@ -282,7 +282,7 @@
       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,
@@ -318,13 +318,7 @@
       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,
@@ -367,8 +361,8 @@
 
   // 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();