Reland: Implement Aura side of unified touch text selection for contents

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b21289b46ffc7ede75fcbde6962126953a0945a0..3b901188191c0dce24993306b6695de075516fdc 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -233,6 +233,7 @@
       'browser/net_info_browsertest.cc',
       'browser/renderer_host/input/touch_action_browsertest.cc',
       'browser/renderer_host/input/touch_input_browsertest.cc',
+      'browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc',
       'browser/renderer_host/render_message_filter_browsertest.cc',
       'browser/renderer_host/render_process_host_browsertest.cc',
       'browser/renderer_host/render_view_host_browsertest.cc',
@@ -247,7 +248,6 @@
       'browser/tracing/background_tracing_manager_browsertest.cc',
       'browser/tracing/tracing_controller_browsertest.cc',
       'browser/web_contents/opened_by_dom_browsertest.cc',
-      'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
       'browser/web_contents/web_contents_impl_browsertest.cc',
       'browser/web_contents/web_contents_view_aura_browsertest.cc',
       'browser/webkit_browsertest.cc',
@@ -1444,11 +1444,6 @@
           ],
           'sources': [ '<@(content_browsertests_sources)' ],
           'conditions': [
-            ['chromeos==0', {
-              'sources!': [
-                'browser/web_contents/touch_editable_impl_aura_browsertest.cc',
-              ],
-            }],
             ['OS=="win"', {
               'resource_include_dirs': [
                 '<(SHARED_INTERMEDIATE_DIR)/webkit',
@@ -1524,6 +1519,15 @@
                 'browser/compositor/image_transport_factory_browsertest.cc',
               ],
             }],
+            ['use_aura==1', {
+              'dependencies': [
+                '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection',
+                '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_test_support',
+              ]}, {
+              'sources!': [
+                'browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc',
+              ],
+            }],
             ['enable_webrtc==1', {
               'sources': [ '<@(content_browsertests_webrtc_sources)' ],
               'dependencies': [