The test_worker.vsprops file had wrong link to another vsprop file.

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

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

10 files changed, 62 insertions, 21 deletions

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 6e59a11..7770602 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -1402,7 +1402,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "url_fetch_test", "test\url_
 		{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "test\worker\test_worker.vcproj", "{3E03D462-780D-4C4D-B22E-5E095E6CF110}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "..\webkit\tools\test_shell\test_worker\test_worker.vcproj", "{3E03D462-780D-4C4D-B22E-5E095E6CF110}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}
diff --git a/chrome/test/worker/DEPS b/chrome/test/worker/DEPS
deleted file mode 100644
index c5488d4..0000000
--- a/chrome/test/worker/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+webkit/tools/test_shell",
-]
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 393aa92..617d07c 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -474,7 +474,7 @@
           'target_name': 'test_worker',
           'type': 'shared_library',
           'xcode_settings': {
-             'EXPORTED_SYMBOLS_FILE': '../../../chrome/test/worker/test_worker.exp',
+             'EXPORTED_SYMBOLS_FILE': 'test_worker/test_worker.exp',
           },
           'dependencies': [
             '../../../base/base.gyp:base',
@@ -487,9 +487,8 @@
             '../../webkit.gyp:webkit',
           ],
           'sources': [
-            '../../../chrome/test/worker/test_webworker.cc',
-            '../../../chrome/test/worker/test_worker_main.cc',
-            '../../../chrome/worker/worker_webkitclient_impl.cc',
+            'test_worker/test_webworker.cc',
+            'test_worker/test_worker_main.cc',
           ],
         },
       ],
diff --git a/chrome/test/worker/test_webworker.cc b/webkit/tools/test_shell/test_worker/test_webworker.cc
index 066d4ca..0be6977 100644
--- a/chrome/test/worker/test_webworker.cc
+++ b/webkit/tools/test_shell/test_worker/test_webworker.cc
@@ -6,7 +6,7 @@
 
 #if ENABLE(WORKERS)
 
-#include "chrome/test/worker/test_webworker.h"
+#include "webkit/tools/test_shell/test_worker/test_webworker.h"
 
 #include "base/compiler_specific.h"
 #include "base/task.h"
diff --git a/chrome/test/worker/test_webworker.h b/webkit/tools/test_shell/test_worker/test_webworker.h
index aa192e7..aa192e7 100644
--- a/chrome/test/worker/test_webworker.h
+++ b/webkit/tools/test_shell/test_worker/test_webworker.h
diff --git a/chrome/test/worker/test_worker.def b/webkit/tools/test_shell/test_worker/test_worker.def
index 7f6db18..7f6db18 100644
--- a/chrome/test/worker/test_worker.def
+++ b/webkit/tools/test_shell/test_worker/test_worker.def
diff --git a/chrome/test/worker/test_worker.exp b/webkit/tools/test_shell/test_worker/test_worker.exp
index 88f6ee1..88f6ee1 100644
--- a/chrome/test/worker/test_worker.exp
+++ b/webkit/tools/test_shell/test_worker/test_worker.exp
diff --git a/chrome/test/worker/test_worker.vcproj b/webkit/tools/test_shell/test_worker/test_worker.vcproj
index c51bbf6..0332e39 100644
--- a/chrome/test/worker/test_worker.vcproj
+++ b/webkit/tools/test_shell/test_worker/test_worker.vcproj
@@ -141,7 +141,7 @@
 	</References>

 	<Files>

 		<File

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

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

 			>

 		</File>

 		<File

@@ -160,14 +160,6 @@
 			RelativePath=".\test_worker_main.cc"

 			>

 		</File>

-		<File

-			RelativePath="..\..\worker\worker_webkitclient_impl.cc"

-			>

-		</File>

-		<File

-			RelativePath="..\..\worker\worker_webkitclient_impl.h"

-			>

-		</File>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/chrome/test/worker/test_worker.vsprops b/webkit/tools/test_shell/test_worker/test_worker.vsprops
index 6a5cdcc..4d56df3 100644
--- a/chrome/test/worker/test_worker.vsprops
+++ b/webkit/tools/test_shell/test_worker/test_worker.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"

 	Version="8.00"

 	Name="test_worker"

-	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\..\..\webkit\build\webkit_common.vsprops"

+	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\..\..\build\webkit_common.vsprops"

 	>

 	<Tool

 		Name="VCLinkerTool"

diff --git a/chrome/test/worker/test_worker_main.cc b/webkit/tools/test_shell/test_worker/test_worker_main.cc
index 9c6b1cc..7fe6b61 100644
--- a/chrome/test/worker/test_worker_main.cc
+++ b/webkit/tools/test_shell/test_worker/test_worker_main.cc
@@ -10,20 +10,73 @@
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "chrome/worker/worker_webkitclient_impl.h"
-#include "chrome/test/worker/test_webworker.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webworker.h"
+#include "webkit/glue/webkitclient_impl.h"
 #include "webkit/glue/webworkerclient.h"
 #include "webkit/tools/test_shell/test_webworker_helper.h"
+#include "webkit/tools/test_shell/test_worker/test_webworker.h"
 
 // Create a global AtExitManager so that our code can use code from base that
 // uses Singletons, for example.  We don't care about static constructors here.
 static base::AtExitManager global_at_exit_manager;
 
+// Stub WebKit Client.
+class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl {
+ public:
+  // WebKitClient methods:
+  virtual WebKit::WebClipboard* clipboard() {
+    NOTREACHED();
+    return NULL;
+  }
+
+  virtual WebKit::WebMimeRegistry* mimeRegistry() {
+    NOTREACHED();
+    return NULL;
+  }
+
+  virtual WebKit::WebSandboxSupport* sandboxSupport() {
+    NOTREACHED();
+    return NULL;
+  }
+
+  virtual unsigned long long visitedLinkHash(const char* canonicalURL,
+                                             size_t length) {
+    NOTREACHED();
+    return 0;
+  }
+
+  virtual bool isLinkVisited(unsigned long long linkHash) {
+    NOTREACHED();
+    return false;
+  }
+
+  virtual void setCookies(const WebKit::WebURL& url,
+                          const WebKit::WebURL& policy_url,
+                          const WebKit::WebString& value) {
+    NOTREACHED();
+  }
+
+  virtual WebKit::WebString cookies(const WebKit::WebURL& url,
+                                    const WebKit::WebURL& policy_url) {
+    NOTREACHED();
+    return WebKit::WebString();
+  }
+
+  virtual void prefetchHostName(const WebKit::WebString&) {
+    NOTREACHED();
+  }
+
+  virtual WebKit::WebString defaultLocale() {
+    NOTREACHED();
+    return WebKit::WebString();
+  }
+};
+
 // WebKit client used in DLL.
 static scoped_ptr<WorkerWebKitClientImpl> webkit_client;