Move simple_clipboard_impl.cc to webkit/tools/test_shell where it belongs.

Review URL: http://codereview.chromium.org/100144


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

6 files changed, 4 insertions, 14 deletions

diff --git a/webkit/glue/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index 264dfa5..264dfa5 100644
--- a/webkit/glue/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 9c916f6..f660ffe 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -39,13 +39,6 @@
         '../../webkit.gyp:webkit',
       ],
       'sources': [
-        # TODO: Clean this up.
-        # An alternate implementation for chrome on windows lives in:
-        #   chrome/renderer/renderer_glue.cc
-        # As a consequence this can't be baked directly into glue.
-        # This version is needed for test_shell and test_shell_tests so
-        # it gets baked into test_shell_common for now.
-        '../../glue/simple_clipboard_impl.cc',
         'mac/DumpRenderTreePasteboard.h',
         'mac/DumpRenderTreePasteboard.m',
         'mac/test_shell_webview.h',
@@ -65,6 +58,7 @@
         'mock_webclipboard_impl.cc',
         'mock_webclipboard_impl.h',
         'resource.h',
+        'simple_clipboard_impl.cc',
         'simple_resource_loader_bridge.cc',
         'simple_resource_loader_bridge.h',
         'test_navigation_controller.cc',
@@ -152,7 +146,6 @@
           'sources!': [
             'drag_delegate.cc',
             'drop_delegate.cc',
-            '../../glue/simple_clipboard_impl.cc',
           ],
         }],
       ],
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index 7169a9b..9525a72 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -250,7 +250,7 @@
 			>

 		</File>

 		<File

-			RelativePath="..\..\glue\simple_clipboard_impl.cc"

+			RelativePath=".\simple_clipboard_impl.cc"

 			>

 		</File>

 		<File

diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index 432f101..e4da9ba 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -203,7 +203,7 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\glue\simple_clipboard_impl.cc"

+				RelativePath=".\simple_clipboard_impl.cc"

 				>

 			</File>

 			<File

diff --git a/webkit/tools/test_shell/test_worker/test_worker.vcproj b/webkit/tools/test_shell/test_worker/test_worker.vcproj
index d9f6997..4634b70 100644
--- a/webkit/tools/test_shell/test_worker/test_worker.vcproj
+++ b/webkit/tools/test_shell/test_worker/test_worker.vcproj
@@ -141,7 +141,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\..\glue\simple_clipboard_impl.cc"
+			RelativePath="..\simple_clipboard_impl.cc"
 			>
 		</File>
 		<File
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 3fc685f..6177f43 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4427,7 +4427,6 @@
         'glue/scoped_clipboard_writer_glue.h',
         'glue/searchable_form_data.cc',
         'glue/searchable_form_data.h',
-        'glue/simple_clipboard_impl.cc',
         'glue/simple_webmimeregistry_impl.cc',
         'glue/simple_webmimeregistry_impl.h',
         'glue/stacking_order_iterator.cc',
@@ -4567,8 +4566,6 @@
           ],
           'sources!': [
             'glue/plugins/plugin_stubs.cc',
-            # Used directly in test_shell* so it can be replaced in chromium.
-            'glue/simple_clipboard_impl.cc',
           ],
         }],
       ],