- Provide Rpc classes with unique ids so that their message id spaces do not intersect;

- Implement tests for DevToolsRpc
- Do not import PlatformString in headers

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

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

16 files changed, 1162 insertions, 985 deletions

diff --git a/webkit/glue/devtools/devtools_mock_rpc.h b/webkit/glue/devtools/devtools_mock_rpc.h
index 1a56b2f..c424306 100644
--- a/webkit/glue/devtools/devtools_mock_rpc.h
+++ b/webkit/glue/devtools/devtools_mock_rpc.h
@@ -8,13 +8,10 @@
 #include <string>
 
 #include "base/string_util.h"
-#include "PlatformString.h"
-
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/devtools/devtools_rpc.h"
 #include "webkit/glue/glue_util.h"
 
-using WebCore::String;
-
 // Universal mock delegate for DevToolsRpc. Typical usage of the mock is:
 // mock->Method1();  // Set expectation.
 // mock->Replay();
@@ -26,7 +23,11 @@ class DevToolsMockRpc : public DevToolsRpc::Delegate {
   ~DevToolsMockRpc() {}
 
   virtual void SendRpcMessage(const std::string& msg) {
-    log_ = StringPrintf("%s\n%s", log_.c_str(), msg.c_str());
+    if (!log_.length()) {
+      log_ = msg;
+    } else {
+      log_ = StringPrintf("%s\n%s", log_.c_str(), msg.c_str());
+    }
   }
 
   void Replay() {
@@ -35,7 +36,7 @@ class DevToolsMockRpc : public DevToolsRpc::Delegate {
   }
 
   void Verify() {
-    EXPECT_EQ(ref_log_, log_);
+    ASSERT_EQ(ref_log_, log_);
   }
 
   void Reset() {
@@ -43,6 +44,8 @@ class DevToolsMockRpc : public DevToolsRpc::Delegate {
     log_ = "";
   }
 
+  const std::string &get_log() { return log_; }
+
  private:
   std::string log_;
   std::string ref_log_;
diff --git a/webkit/glue/devtools/devtools_rpc.cc b/webkit/glue/devtools/devtools_rpc.cc
index 29cbd78..e392ef9 100644
--- a/webkit/glue/devtools/devtools_rpc.cc
+++ b/webkit/glue/devtools/devtools_rpc.cc
@@ -2,15 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/devtools/devtools_rpc.h"
+// TODO(pfeldman): Remove these once JSON is available in
+// WebCore namespace.
 
 #include "PlatformString.h"
+#undef LOG
 
-// TODO(pfeldman): Remove these once JSON is available in
-// WebCore namespace.
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/values.h"
+#include "webkit/glue/devtools/devtools_rpc.h"
 #include "webkit/glue/glue_util.h"
 
 DevToolsRpc::DevToolsRpc(Delegate* delegate) : delegate_(delegate) {
diff --git a/webkit/glue/devtools/devtools_rpc.h b/webkit/glue/devtools/devtools_rpc.h
index 3fbcc7d..97a23c5 100644
--- a/webkit/glue/devtools/devtools_rpc.h
+++ b/webkit/glue/devtools/devtools_rpc.h
@@ -54,12 +54,16 @@
 
 #include <string>
 
-#include "PlatformString.h"
 #include <wtf/OwnPtr.h>
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/values.h"
 
+namespace WebCore {
+class String;
+}
+
 using WebCore::String;
 
 ///////////////////////////////////////////////////////
@@ -120,25 +124,26 @@ struct RpcTypeTrait<String> {
 
 #define TOOLS_RPC_STUB_METHOD0(Method) \
   virtual void Method() { \
-    InvokeAsync(METHOD_##Method); \
+  InvokeAsync(RpcTypeToNumber<CLASS>::number, METHOD_##Method); \
   }
 
 #define TOOLS_RPC_STUB_METHOD1(Method, T1) \
   virtual void Method(RpcTypeTrait<T1>::ApiType t1) { \
-    InvokeAsync(METHOD_##Method, &t1); \
+    InvokeAsync(RpcTypeToNumber<CLASS>::number, METHOD_##Method, &t1); \
   }
 
 #define TOOLS_RPC_STUB_METHOD2(Method, T1, T2) \
   virtual void Method(RpcTypeTrait<T1>::ApiType t1, \
                       RpcTypeTrait<T2>::ApiType t2) { \
-    InvokeAsync(METHOD_##Method, &t1, &t2); \
+    InvokeAsync(RpcTypeToNumber<CLASS>::number, METHOD_##Method, &t1, &t2); \
   }
 
 #define TOOLS_RPC_STUB_METHOD3(Method, T1, T2, T3) \
   virtual void Method(RpcTypeTrait<T1>::ApiType t1, \
                       RpcTypeTrait<T2>::ApiType t2, \
                       RpcTypeTrait<T3>::ApiType t3) { \
-    InvokeAsync(METHOD_##Method, &t1, &t2, &t3); \
+    InvokeAsync(RpcTypeToNumber<CLASS>::number, METHOD_##Method, &t1, &t2, \
+        &t3); \
   }
 
 ///////////////////////////////////////////////////////
@@ -153,17 +158,18 @@ case CLASS::METHOD_##Method: { \
 #define TOOLS_RPC_DISPATCH1(Method, T1) \
 case CLASS::METHOD_##Method: { \
   RpcTypeTrait<T1>::DispatchType t1; \
-  DevToolsRpc::GetListValue(*message.get(), 1, &t1); \
+  DevToolsRpc::GetListValue(*message.get(), 2, &t1); \
   delegate->Method( \
       RpcTypeTrait<T1>::Pass(t1)); \
+  return true; \
 }
 
 #define TOOLS_RPC_DISPATCH2(Method, T1, T2) \
 case CLASS::METHOD_##Method: { \
   RpcTypeTrait<T1>::DispatchType t1; \
   RpcTypeTrait<T2>::DispatchType t2; \
-  DevToolsRpc::GetListValue(*message.get(), 1, &t1); \
-  DevToolsRpc::GetListValue(*message.get(), 2, &t2); \
+  DevToolsRpc::GetListValue(*message.get(), 2, &t1); \
+  DevToolsRpc::GetListValue(*message.get(), 3, &t2); \
   delegate->Method( \
       RpcTypeTrait<T1>::Pass(t1), \
       RpcTypeTrait<T2>::Pass(t2) \
@@ -176,9 +182,9 @@ case CLASS::METHOD_##Method: { \
   RpcTypeTrait<T1>::DispatchType t1; \
   RpcTypeTrait<T2>::DispatchType t2; \
   RpcTypeTrait<T3>::DispatchType t3; \
-  DevToolsRpc::GetListValue(*message.get(), 1, &t1); \
-  DevToolsRpc::GetListValue(*message.get(), 2, &t2); \
-  DevToolsRpc::GetListValue(*message.get(), 3, &t3); \
+  DevToolsRpc::GetListValue(*message.get(), 2, &t1); \
+  DevToolsRpc::GetListValue(*message.get(), 3, &t2); \
+  DevToolsRpc::GetListValue(*message.get(), 4, &t3); \
   delegate->Method( \
       RpcTypeTrait<T1>::Pass(t1), \
       RpcTypeTrait<T2>::Pass(t2), \
@@ -217,6 +223,7 @@ class Class##Stub : public Class, public DevToolsRpc { \
  public: \
   explicit Class##Stub(Delegate* delegate) : DevToolsRpc(delegate) {} \
   virtual ~Class##Stub() {} \
+  typedef Class CLASS; \
   STRUCT( \
     TOOLS_RPC_STUB_METHOD0, \
     TOOLS_RPC_STUB_METHOD1, \
@@ -233,8 +240,13 @@ class Class##Dispatch { \
   bool Dispatch(Class* delegate, const std::string& raw_msg) { \
     OwnPtr<ListValue> message( \
         static_cast<ListValue*>(DevToolsRpc::ParseMessage(raw_msg))); \
+    int class_id; \
+    message->GetInteger(0, &class_id); \
+    if (class_id != RpcTypeToNumber<Class>::number) { \
+      return false; \
+    } \
     int method; \
-    message->GetInteger(0, &method); \
+    message->GetInteger(1, &method); \
     typedef Class CLASS; \
     switch (method) { \
       STRUCT( \
@@ -250,6 +262,27 @@ class Class##Dispatch { \
 };
 
 ///////////////////////////////////////////////////////
+// Following templates allow mapping types to numbers.
+
+template <typename T>
+class RpcTypeToNumberCounter {
+ public:
+  static int next_number_;
+};
+template <typename T>
+int RpcTypeToNumberCounter<T>::next_number_ = 0;
+
+template <typename T>
+class RpcTypeToNumber {
+ public:
+  static const int number;
+};
+
+template <typename T>
+const int RpcTypeToNumber<T>::number =
+    RpcTypeToNumberCounter<void>::next_number_++;
+
+///////////////////////////////////////////////////////
 // RPC base class
 class DevToolsRpc {
  public:
@@ -265,29 +298,33 @@ class DevToolsRpc {
   explicit DevToolsRpc(Delegate* delegate);
   virtual ~DevToolsRpc();
 
-  void InvokeAsync(int method) {
+  void InvokeAsync(int class_id, int method) {
     ListValue message;
+    message.Append(CreateValue(&class_id));
     message.Append(CreateValue(&method));
     SendValueMessage(&message);
   }
   template<class T1>
-  void InvokeAsync(int method, T1 t1) {
+  void InvokeAsync(int class_id, int method, T1 t1) {
     ListValue message;
+    message.Append(CreateValue(&class_id));
     message.Append(CreateValue(&method));
     message.Append(CreateValue(t1));
     SendValueMessage(&message);
   }
   template<class T1, class T2>
-  void InvokeAsync(int method, T1 t1, T2 t2) {
+  void InvokeAsync(int class_id, int method, T1 t1, T2 t2) {
     ListValue message;
+    message.Append(CreateValue(&class_id));
     message.Append(CreateValue(&method));
     message.Append(CreateValue(t1));
     message.Append(CreateValue(t2));
     SendValueMessage(&message);
   }
   template<class T1, class T2, class T3>
-  void InvokeAsync(int method, T1 t1, T2 t2, T3 t3) {
+  void InvokeAsync(int class_id, int method, T1 t1, T2 t2, T3 t3) {
     ListValue message;
+    message.Append(CreateValue(&class_id));
     message.Append(CreateValue(&method));
     message.Append(CreateValue(t1));
     message.Append(CreateValue(t2));
diff --git a/webkit/glue/devtools/devtools_rpc_unittest.cc b/webkit/glue/devtools/devtools_rpc_unittest.cc
new file mode 100644
index 0000000..282d511
--- /dev/null
+++ b/webkit/glue/devtools/devtools_rpc_unittest.cc
@@ -0,0 +1,131 @@
+// Copyright (c) 2009 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 "PlatformString.h"
+#undef LOG
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/devtools/devtools_mock_rpc.h"
+#include "webkit/glue/devtools/devtools_rpc.h"
+
+namespace {
+
+#define TEST_RPC_STRUCT(METHOD0, METHOD1, METHOD2, METHOD3) \
+  METHOD0(Method0) \
+  METHOD1(Method1, int) \
+  METHOD2(Method2, int, String) \
+  METHOD3(Method3, int, String, Value)
+DEFINE_RPC_CLASS(TestRpcClass, TEST_RPC_STRUCT)
+
+#define ANOTHER_TEST_RPC_STRUCT(METHOD0, METHOD1, METHOD2, METHOD3) \
+  METHOD0(Method0)
+DEFINE_RPC_CLASS(AnotherTestRpcClass, ANOTHER_TEST_RPC_STRUCT)
+
+class MockTestRpcClass : public TestRpcClassStub,
+                         public DevToolsMockRpc {
+ public:
+  MockTestRpcClass() : TestRpcClassStub(NULL) {
+    set_delegate(this);
+  }
+  ~MockTestRpcClass() {}
+};
+
+class MockAnotherTestRpcClass : public AnotherTestRpcClassStub,
+                                public DevToolsMockRpc {
+ public:
+  MockAnotherTestRpcClass() : AnotherTestRpcClassStub(NULL) {
+    set_delegate(this);
+  }
+  ~MockAnotherTestRpcClass() {}
+};
+
+class DevToolsRpcTests : public testing::Test {
+ public:
+  DevToolsRpcTests() {}
+
+ protected:
+  virtual void SetUp() {}
+  virtual void TearDown() {}
+};
+
+// Tests method call serialization.
+TEST_F(DevToolsRpcTests, TestSerialize) {
+  MockTestRpcClass mock;
+  mock.Method0();
+  int id = RpcTypeToNumber<TestRpcClass>::number;
+  EXPECT_EQ(StringPrintf("[%d,0]", id), mock.get_log());
+  mock.Reset();
+
+  mock.Method1(10);
+  EXPECT_EQ(StringPrintf("[%d,1,10]", id), mock.get_log());
+  mock.Reset();
+
+  mock.Method2(20, "foo");
+  EXPECT_EQ(StringPrintf("[%d,2,20,\"foo\"]", id), mock.get_log());
+  mock.Reset();
+
+  StringValue value("bar");
+  mock.Method3(30, "foo", value);
+  EXPECT_EQ(StringPrintf("[%d,3,30,\"foo\",\"bar\"]", id), mock.get_log());
+  mock.Reset();
+}
+
+// Tests method call dispatch.
+TEST_F(DevToolsRpcTests, TestDispatch) {
+  MockTestRpcClass local;
+  MockTestRpcClass remote;
+  TestRpcClassDispatch dispatch;
+
+  // Call 1.
+  local.Reset();
+  local.Method0();
+  remote.Reset();
+  remote.Method0();
+  remote.Replay();
+
+  dispatch.Dispatch(&remote, local.get_log());
+  remote.Verify();
+
+  // Call 2.
+  local.Reset();
+  local.Method1(10);
+  remote.Reset();
+  remote.Method1(10);
+  remote.Replay();
+  dispatch.Dispatch(&remote, local.get_log());
+  remote.Verify();
+
+  // Call 3.
+  local.Reset();
+  remote.Reset();
+  local.Method2(20, "foo");
+  remote.Method2(20, "foo");
+
+  remote.Replay();
+  dispatch.Dispatch(&remote, local.get_log());
+  remote.Verify();
+
+  // Call 4.
+  local.Reset();
+  remote.Reset();
+  StringValue value("bar");
+  local.Method3(30, "foo", value);
+  remote.Method3(30, "foo", value);
+
+  remote.Replay();
+  dispatch.Dispatch(&remote, local.get_log());
+  remote.Verify();
+}
+
+// Tests class unique id.
+TEST_F(DevToolsRpcTests, TestClassId) {
+  MockAnotherTestRpcClass mock;
+  ASSERT_TRUE(RpcTypeToNumber<TestRpcClass>::number !=
+      RpcTypeToNumber<AnotherTestRpcClass>::number);
+
+  int id = RpcTypeToNumber<AnotherTestRpcClass>::number;
+  mock.Method0();
+  ASSERT_EQ(StringPrintf("[%d,0]", id), mock.get_log());
+}
+
+}  // namespace
diff --git a/webkit/glue/devtools/dom_agent_impl.cc b/webkit/glue/devtools/dom_agent_impl.cc
index 5f7a66a..166063a 100644
--- a/webkit/glue/devtools/dom_agent_impl.cc
+++ b/webkit/glue/devtools/dom_agent_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#include "webkit/glue/devtools/dom_agent_impl.h"
-
 #include "AtomicString.h"
 #include "Document.h"
 #include "Event.h"
@@ -16,12 +14,14 @@
 #include "markup.h"
 #include "MutationEvent.h"
 #include "Node.h"
+#include "PlatformString.h"
 #include "Text.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/Vector.h>
 #undef LOG
 
 #include "base/values.h"
+#include "webkit/glue/devtools/dom_agent_impl.h"
 #include "webkit/glue/glue_util.h"
 
 using namespace WebCore;
diff --git a/webkit/glue/devtools/dom_agent_impl.h b/webkit/glue/devtools/dom_agent_impl.h
index 12d7540..5a58433 100644
--- a/webkit/glue/devtools/dom_agent_impl.h
+++ b/webkit/glue/devtools/dom_agent_impl.h
@@ -7,7 +7,6 @@
 
 #include "config.h"
 
-#include "EventListener.h"
 #include <wtf/ListHashSet.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
diff --git a/webkit/glue/devtools/dom_agent_unittest.cc b/webkit/glue/devtools/dom_agent_unittest.cc
index 8c01e04..ef92f8a 100644
--- a/webkit/glue/devtools/dom_agent_unittest.cc
+++ b/webkit/glue/devtools/dom_agent_unittest.cc
@@ -4,12 +4,12 @@
 
 #include "config.h"
 
-#include <wtf/OwnPtr.h>
-
 #include "CString.h"
 #include "Document.h"
+#include "EventListener.h"
 #include "HTMLFrameOwnerElement.h"
 #include "PlatformString.h"
+#include <wtf/OwnPtr.h>
 #undef LOG
 
 #include "base/file_path.h"
@@ -19,7 +19,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/devtools/devtools_mock_rpc.h"
 #include "webkit/glue/devtools/devtools_rpc.h"
-#include "webkit/glue/devtools/dom_agent.h"
 #include "webkit/glue/devtools/dom_agent_impl.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_util.h"
diff --git a/webkit/glue/devtools/net_agent_impl.cc b/webkit/glue/devtools/net_agent_impl.cc
index 67fe1b8..08a64fb 100644
--- a/webkit/glue/devtools/net_agent_impl.cc
+++ b/webkit/glue/devtools/net_agent_impl.cc
@@ -4,8 +4,6 @@
 
 #include "config.h"
 
-#include "webkit/glue/devtools/net_agent_impl.h"
-
 #include "CachedCSSStyleSheet.h"
 #include "CachedResource.h"
 #include "CachedScript.h"
@@ -27,6 +25,7 @@
 #include "base/basictypes.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/glue/devtools/net_agent_impl.h"
 #include "webkit/glue/glue_util.h"
 
 using namespace WebCore;
diff --git a/webkit/glue/glue.vcproj b/webkit/glue/glue.vcproj
index 332bb54..5f257ee 100644
--- a/webkit/glue/glue.vcproj
+++ b/webkit/glue/glue.vcproj
@@ -1,915 +1,915 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="Glue"
-	ProjectGUID="{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}"
-	RootNamespace="glue"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\glue.vsprops;..\build\WebKit\using_WebKit.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\glue.vsprops;..\build\WebKit\using_WebKit.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="API"
-			>
-			<File
-				RelativePath=".\autofill_form.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\autofill_form.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cache_manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\console_message_level.h"
-				>
-			</File>
-			<File
-				RelativePath=".\context_menu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cpp_bound_class.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cpp_variant.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dom_operations.h"
-				>
-			</File>
-			<File
-				RelativePath=".\form_data.h"
-				>
-			</File>
-			<File
-				RelativePath=".\image_decoder.h"
-				>
-			</File>
-			<File
-				RelativePath=".\password_form.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource_type.h"
-				>
-			</File>
-			<File
-				RelativePath=".\screen_info.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdatasource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\weberror.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webframe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webhistoryitem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webinputevent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webinputevent_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webmediaplayer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webmediaplayer_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webplugin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webplugin_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webpreferences.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webresponse.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webtextinput.h"
-				>
-			</File>
-			<File
-				RelativePath=".\weburlrequest.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webview_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webwidget.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webwidget_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webworker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webworkerclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\window_open_disposition.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Library"
-			>
-			<File
-				RelativePath="..\pending\AccessibleBase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\pending\AccessibleBase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\pending\AccessibleDocument.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\pending\AccessibleDocument.h"
-				>
-			</File>
-			<File
-				RelativePath=".\alt_404_page_resource_fetcher.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\alt_404_page_resource_fetcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\alt_error_page_resource_fetcher.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\alt_error_page_resource_fetcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\back_forward_list_client_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\back_forward_list_client_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cache_manager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\chrome_client_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\chrome_client_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\chromium_bridge_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\clipboard_conversion.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\clipboard_conversion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\context_menu_client_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\context_menu_client_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cpp_binding_example.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\cpp_bound_class.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\cpp_variant.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\debugger_bridge.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\debugger_bridge.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dom_operations.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\dom_operations_private.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dom_serializer.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\dom_serializer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dom_serializer_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dragclient_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\dragclient_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\editor_client_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\editor_client_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\entity_map.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\entity_map.h"
-				>
-			</File>
-			<File
-				RelativePath=".\event_conversion.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\event_conversion.h"
-				>
-			</File>
-			<File
-				RelativePath=".\feed_preview.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\feed_preview.h"
-				>
-			</File>
-			<File
-				RelativePath=".\glue_accessibility.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\glue_accessibility.h"
-				>
-			</File>
-			<File
-				RelativePath=".\glue_serialize.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\glue_serialize.h"
-				>
-			</File>
-			<File
-				RelativePath=".\glue_util.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\glue_util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\image_decoder.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\image_resource_fetcher.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\image_resource_fetcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\inspector_client_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\inspector_client_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\localized_strings.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\media_player_private_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\multipart_response_delegate.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\multipart_response_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\npruntime_util.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\npruntime_util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\password_autocomplete_listener.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\password_autocomplete_listener.h"
-				>
-			</File>
-			<File
-				RelativePath=".\password_form_dom_manager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\password_form_dom_manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource_fetcher.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\resource_fetcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource_handle_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\resource_loader_bridge.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\resource_loader_bridge.h"
-				>
-			</File>
-			<File
-				RelativePath=".\scoped_clipboard_writer_glue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\searchable_form_data.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\searchable_form_data.h"
-				>
-			</File>
-			<File
-				RelativePath=".\simple_webmimeregistry_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\simple_webmimeregistry_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stacking_order_iterator.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\stacking_order_iterator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webclipboard_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webclipboard_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webcursor.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webcursor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webcursor_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webdatasource_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webdatasource_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsagent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsagent_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsagent_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsagent_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsclient.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsclient_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsclient_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webdevtoolsclient_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdocumentloader_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webdocumentloader_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webdropdata.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webdropdata.h"
-				>
-			</File>
-			<File
-				RelativePath=".\weberror_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\weberror_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webframe_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webframe_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webframeloaderclient_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webframeloaderclient_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webhistoryitem_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webhistoryitem_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webinputevent_util.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webinputevent_util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webkit_glue.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webkit_glue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webkit_glue_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webkitclient_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webkitclient_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webmediaplayer_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webmediaplayer_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webplugin_delegate.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webplugin_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webplugin_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webresponse_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webtextinput_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webtextinput_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webthemeengine_impl_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webthemeengine_impl_win.h"
-				>
-			</File>
-			<File
-				RelativePath=".\weburlrequest_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\weburlrequest_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webview_delegate.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webview_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webview_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webwidget_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webwidget_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webworker_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webworker_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\webworkerclient_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\webworkerclient_impl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Plugins"
-			>
-			<File
-				RelativePath=".\plugins\mozilla_extensions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\mozilla_extensions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\nphostapi.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_constants_win.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_host.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_host.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_instance.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_instance.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_lib.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_lib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_lib_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_list.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_list.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_list_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_stream.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_stream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_stream_url.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_stream_url.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_stream_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_string_stream.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\plugin_string_stream.h"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\webplugin_delegate_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\plugins\webplugin_delegate_impl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="DevTools"
-			>
-			<File
-				RelativePath=".\devtools\devtools_rpc.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\devtools_rpc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\dom_agent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\dom_agent_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\dom_agent_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\net_agent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\net_agent_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\net_agent_impl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\devtools\tools_agent.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="Glue"

+	ProjectGUID="{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}"

+	RootNamespace="glue"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\glue.vsprops;..\build\WebKit\using_WebKit.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\glue.vsprops;..\build\WebKit\using_WebKit.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="API"

+			>

+			<File

+				RelativePath=".\autofill_form.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\autofill_form.h"

+				>

+			</File>

+			<File

+				RelativePath=".\cache_manager.h"

+				>

+			</File>

+			<File

+				RelativePath=".\console_message_level.h"

+				>

+			</File>

+			<File

+				RelativePath=".\context_menu.h"

+				>

+			</File>

+			<File

+				RelativePath=".\cpp_bound_class.h"

+				>

+			</File>

+			<File

+				RelativePath=".\cpp_variant.h"

+				>

+			</File>

+			<File

+				RelativePath=".\dom_operations.h"

+				>

+			</File>

+			<File

+				RelativePath=".\form_data.h"

+				>

+			</File>

+			<File

+				RelativePath=".\image_decoder.h"

+				>

+			</File>

+			<File

+				RelativePath=".\password_form.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource_type.h"

+				>

+			</File>

+			<File

+				RelativePath=".\screen_info.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdatasource.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsagent.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsagent_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsclient.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsclient_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\weberror.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webframe.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webhistoryitem.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webinputevent.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webinputevent_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webmediaplayer.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webmediaplayer_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webplugin.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webplugin_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webpreferences.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webresponse.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webtextinput.h"

+				>

+			</File>

+			<File

+				RelativePath=".\weburlrequest.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webview.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webview_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webwidget.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webwidget_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webworker.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webworkerclient.h"

+				>

+			</File>

+			<File

+				RelativePath=".\window_open_disposition.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Library"

+			>

+			<File

+				RelativePath="..\pending\AccessibleBase.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\pending\AccessibleBase.h"

+				>

+			</File>

+			<File

+				RelativePath="..\pending\AccessibleDocument.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\pending\AccessibleDocument.h"

+				>

+			</File>

+			<File

+				RelativePath=".\alt_404_page_resource_fetcher.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\alt_404_page_resource_fetcher.h"

+				>

+			</File>

+			<File

+				RelativePath=".\alt_error_page_resource_fetcher.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\alt_error_page_resource_fetcher.h"

+				>

+			</File>

+			<File

+				RelativePath=".\back_forward_list_client_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\back_forward_list_client_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\cache_manager.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\chrome_client_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\chrome_client_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\chromium_bridge_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\clipboard_conversion.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\clipboard_conversion.h"

+				>

+			</File>

+			<File

+				RelativePath=".\context_menu_client_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\context_menu_client_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\cpp_binding_example.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\cpp_bound_class.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\cpp_variant.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\debugger_bridge.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\debugger_bridge.h"

+				>

+			</File>

+			<File

+				RelativePath=".\dom_operations.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\dom_operations_private.h"

+				>

+			</File>

+			<File

+				RelativePath=".\dom_serializer.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\dom_serializer.h"

+				>

+			</File>

+			<File

+				RelativePath=".\dom_serializer_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\dragclient_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\dragclient_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\editor_client_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\editor_client_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\entity_map.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\entity_map.h"

+				>

+			</File>

+			<File

+				RelativePath=".\event_conversion.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\event_conversion.h"

+				>

+			</File>

+			<File

+				RelativePath=".\feed_preview.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\feed_preview.h"

+				>

+			</File>

+			<File

+				RelativePath=".\glue_accessibility.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\glue_accessibility.h"

+				>

+			</File>

+			<File

+				RelativePath=".\glue_serialize.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\glue_serialize.h"

+				>

+			</File>

+			<File

+				RelativePath=".\glue_util.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\glue_util.h"

+				>

+			</File>

+			<File

+				RelativePath=".\image_decoder.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\image_resource_fetcher.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\image_resource_fetcher.h"

+				>

+			</File>

+			<File

+				RelativePath=".\inspector_client_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\inspector_client_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\localized_strings.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\media_player_private_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\multipart_response_delegate.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\multipart_response_delegate.h"

+				>

+			</File>

+			<File

+				RelativePath=".\npruntime_util.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\npruntime_util.h"

+				>

+			</File>

+			<File

+				RelativePath=".\password_autocomplete_listener.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\password_autocomplete_listener.h"

+				>

+			</File>

+			<File

+				RelativePath=".\password_form_dom_manager.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\password_form_dom_manager.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource_fetcher.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\resource_fetcher.h"

+				>

+			</File>

+			<File

+				RelativePath=".\resource_handle_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\resource_loader_bridge.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\resource_loader_bridge.h"

+				>

+			</File>

+			<File

+				RelativePath=".\scoped_clipboard_writer_glue.h"

+				>

+			</File>

+			<File

+				RelativePath=".\searchable_form_data.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\searchable_form_data.h"

+				>

+			</File>

+			<File

+				RelativePath=".\simple_webmimeregistry_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\simple_webmimeregistry_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\stacking_order_iterator.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\stacking_order_iterator.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webclipboard_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webclipboard_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webcursor.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webcursor.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webcursor_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webdatasource_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webdatasource_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsagent_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsagent_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsclient_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webdevtoolsclient_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdocumentloader_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webdocumentloader_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webdropdata.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webdropdata.h"

+				>

+			</File>

+			<File

+				RelativePath=".\weberror_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\weberror_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webframe_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webframe_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webframeloaderclient_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webframeloaderclient_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webhistoryitem_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webhistoryitem_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webinputevent_util.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webinputevent_util.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webkit_glue.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webkit_glue.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webkit_glue_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webkitclient_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webkitclient_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webmediaplayer_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webmediaplayer_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webplugin_delegate.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webplugin_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webplugin_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webresponse_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webtextinput_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webtextinput_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webthemeengine_impl_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webthemeengine_impl_win.h"

+				>

+			</File>

+			<File

+				RelativePath=".\weburlrequest_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\weburlrequest_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webview_delegate.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webview_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webview_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webwidget_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webwidget_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webworker_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webworker_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\webworkerclient_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\webworkerclient_impl.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Plugins"

+			>

+			<File

+				RelativePath=".\plugins\mozilla_extensions.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\mozilla_extensions.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\nphostapi.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_constants_win.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_host.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_host.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_instance.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_instance.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_lib.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_lib.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_lib_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_list.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_list.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_list_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_stream.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_stream.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_stream_url.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_stream_url.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_stream_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_string_stream.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\plugin_string_stream.h"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\webplugin_delegate_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\plugins\webplugin_delegate_impl.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="DevTools"

+			>

+			<File

+				RelativePath=".\devtools\devtools_rpc.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\devtools_rpc.h"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\dom_agent.h"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\dom_agent_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\dom_agent_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\net_agent.h"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\net_agent_impl.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\net_agent_impl.h"

+				>

+			</File>

+			<File

+				RelativePath=".\devtools\tools_agent.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index ecf199c..a548a59 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "webkit/glue/webdevtoolsagent_impl.h"
 
 #include <string>
 
 #include "Document.h"
+#include "EventListener.h"
 #include "InspectorController.h"
 #include "Node.h"
 #include "Page.h"
@@ -19,6 +19,7 @@
 #include "webkit/glue/devtools/net_agent_impl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsagent_delegate.h"
+#include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webview_impl.h"
 
 using WebCore::Document;
diff --git a/webkit/glue/webdevtoolsagent_impl.h b/webkit/glue/webdevtoolsagent_impl.h
index a3f2620..5c03856 100644
--- a/webkit/glue/webdevtoolsagent_impl.h
+++ b/webkit/glue/webdevtoolsagent_impl.h
@@ -17,6 +17,7 @@
 namespace WebCore {
 class Document;
 class Node;
+class String;
 }
 
 class DomAgentImpl;
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 07f0055..647bbfd 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -3,16 +3,15 @@
 // found in the LICENSE file.
 
 #include "config.h"
-#include "webkit/glue/webdevtoolsclient_impl.h"
 
 #include <string>
 
-#include "CString.h"
 #include "Document.h"
 #include "InspectorController.h"
 #include "Node.h"
 #include "Page.h"
 #include "PlatformString.h"
+#undef LOG
 
 #include "base/json_reader.h"
 #include "base/json_writer.h"
@@ -21,6 +20,7 @@
 
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsclient_delegate.h"
+#include "webkit/glue/webdevtoolsclient_impl.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webview_impl.h"
 
@@ -184,9 +184,9 @@ void WebDevToolsClientImpl::JsHideDOMNodeHighlight(const CppArgumentList& args,
   result->SetNull();
 }
 
-void WebDevToolsClientImpl::EvaluateJs(const String& expr) {
+void WebDevToolsClientImpl::EvaluateJs(const std::string& expr) {
   web_view_impl_->GetMainFrame()->ExecuteJavaScript(
-      webkit_glue::StringToStdString(expr),
+      expr,
       GURL(), // script url
       1); // base line number
 }
@@ -206,20 +206,20 @@ void WebDevToolsClientImpl::SendRpcMessage(const std::string& raw_msg) {
 }
 
 // static
-CString WebDevToolsClientImpl::ToJSON(const String& value) {
+std::string WebDevToolsClientImpl::ToJSON(const String& value) {
   StringValue str(webkit_glue::StringToStdString(value));
   return ToJSON(&str);
 }
 
 // static
-CString WebDevToolsClientImpl::ToJSON(int value) {
+std::string WebDevToolsClientImpl::ToJSON(int value) {
   FundamentalValue fund(value);
   return ToJSON(&fund);
 }
 
 // static
-CString WebDevToolsClientImpl::ToJSON(const Value* value) {
+std::string WebDevToolsClientImpl::ToJSON(const Value* value) {
   std::string json;
   JSONWriter::Write(value, false, &json);
-  return webkit_glue::StdStringToString(json).utf8();
+  return json;
 }
diff --git a/webkit/glue/webdevtoolsclient_impl.h b/webkit/glue/webdevtoolsclient_impl.h
index fb1daea..b4ae53e 100644
--- a/webkit/glue/webdevtoolsclient_impl.h
+++ b/webkit/glue/webdevtoolsclient_impl.h
@@ -7,10 +7,7 @@
 
 #include <string>
 
-#include "CString.h"
-#include "PlatformString.h"
-#undef LOG
-
+#include "base/string_util.h"
 #include "webkit/glue/cpp_bound_class.h"
 #include "webkit/glue/devtools/devtools_rpc.h"
 #include "webkit/glue/devtools/dom_agent.h"
@@ -18,6 +15,10 @@
 #include "webkit/glue/devtools/tools_agent.h"
 #include "webkit/glue/webdevtoolsclient.h"
 
+namespace WebCore {
+class String;
+}
+
 class DomAgentStub;
 class NetAgentStub;
 class ToolsAgentStub;
@@ -71,39 +72,39 @@ class WebDevToolsClientImpl : public WebDevToolsClient,
 
  private:
   // MakeJsCall templates.
-  void MakeJsCall(const WebCore::String& func) {
-    EvaluateJs(WebCore::String::format("%s()", func.utf8().data()));
+  void MakeJsCall(const std::string& func) {
+    EvaluateJs(StringPrintf("%s()", func.c_str()));
   }
   template<class T1>
-  void MakeJsCall(const WebCore::String& func, T1 t1) {
-    EvaluateJs(WebCore::String::format("%s(%s)", func.utf8().data(),
-        ToJSON(t1).data()));
+  void MakeJsCall(const std::string& func, T1 t1) {
+    EvaluateJs(StringPrintf("%s(%s)", func.c_str(),
+        ToJSON(t1).c_str()));
   }
   template<class T1, class T2>
-  void MakeJsCall(const WebCore::String& func, T1 t1, T2 t2) {
-    EvaluateJs(WebCore::String::format("%s(%s, %s)", func.utf8().data(),
-        ToJSON(t1).data(), ToJSON(t2).data()));
+  void MakeJsCall(const std::string& func, T1 t1, T2 t2) {
+    EvaluateJs(StringPrintf("%s(%s, %s)", func.c_str(),
+        ToJSON(t1).c_str(), ToJSON(t2).c_str()));
   }
   template<class T1, class T2, class T3>
-  void MakeJsCall(const WebCore::String& func, T1 t1, T2 t2, T3 t3) {
-    EvaluateJs(WebCore::String::format("%s(%s, %s, %s)", func.utf8().data(),
-        ToJSON(t1).data(), ToJSON(t2).data(), ToJSON(t3).data()));
+  void MakeJsCall(const std::string& func, T1 t1, T2 t2, T3 t3) {
+    EvaluateJs(StringPrintf("%s(%s, %s, %s)", func.c_str(),
+        ToJSON(t1).c_str(), ToJSON(t2).c_str(), ToJSON(t3).c_str()));
   }
   template<class T1, class T2, class T3, class T4>
-  void MakeJsCall(const WebCore::String& func, T1 t1, T2 t2, T3 t3, T4 t4) {
-    EvaluateJs(WebCore::String::format("%s(%s, %s, %s, %s)", func.utf8().data(),
-        ToJSON(t1).data(), ToJSON(t2).data(), ToJSON(t3).data(),
-        ToJSON(t4).data()));
+  void MakeJsCall(const std::string& func, T1 t1, T2 t2, T3 t3, T4 t4) {
+    EvaluateJs(StringPrintf("%s(%s, %s, %s, %s)", func.c_str(),
+        ToJSON(t1).c_str(), ToJSON(t2).c_str(), ToJSON(t3).c_str(),
+        ToJSON(t4).c_str()));
   }
   template<class T1, class T2, class T3, class T4, class T5>
-  void MakeJsCall(const WebCore::String& func, T1 t1, T2 t2, T3 t3, T4 t4,
+  void MakeJsCall(const std::string& func, T1 t1, T2 t2, T3 t3, T4 t4,
       T5 t5) {
-    EvaluateJs(WebCore::String::format("%s(%s, %s, %s, %s, %s)",
-        func.utf8().data(), ToJSON(t1).data(), ToJSON(t2).data(),
-        ToJSON(t3).data(), ToJSON(t4).data(), ToJSON(t5).data()));
+    EvaluateJs(StringPrintf("%s(%s, %s, %s, %s, %s)",
+        func.c_str(), ToJSON(t1).c_str(), ToJSON(t2).c_str(),
+        ToJSON(t3).c_str(), ToJSON(t4).c_str(), ToJSON(t5).c_str()));
   }
 
-  void EvaluateJs(const WebCore::String& expr);
+  void EvaluateJs(const std::string& expr);
 
   void JsGetResourceSource(const CppArgumentList& args, CppVariant* result);
 
@@ -123,9 +124,9 @@ class WebDevToolsClientImpl : public WebDevToolsClient,
 
  private:
   // Serializers
-  static WebCore::CString ToJSON(const WebCore::String& value);
-  static WebCore::CString ToJSON(int value);
-  static WebCore::CString ToJSON(const Value* value);
+  static std::string ToJSON(const WebCore::String& value);
+  static std::string ToJSON(int value);
+  static std::string ToJSON(const Value* value);
 
   WebViewImpl* web_view_impl_;
   WebDevToolsClientDelegate* delegate_;
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index c620de0..aae8351 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -256,6 +256,7 @@ test_files = [
     '$WEBKIT_DIR/glue/context_menu_unittest.cc',
     '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc',
     '$WEBKIT_DIR/glue/cpp_variant_unittest.cc',
+    '$WEBKIT_DIR/glue/devtools/devtools_rpc_unittest.cc',
     '$WEBKIT_DIR/glue/devtools/dom_agent_unittest.cc',
     '$WEBKIT_DIR/glue/dom_operations_unittest.cc',
     '$WEBKIT_DIR/glue/dom_serializer_unittest.cc',
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp
index 2950e4b..038fac7 100644
--- a/webkit/tools/test_shell/test_shell.gyp
+++ b/webkit/tools/test_shell/test_shell.gyp
@@ -229,7 +229,7 @@
         '../../glue/cpp_bound_class_unittest.cc',
         '../../glue/cpp_variant_unittest.cc',
         '../../glue/devtools/dom_agent_unittest.cc',
-        '../../glue/devtools/devtools_mock_rpc.h',
+        '../../glue/devtools/devtools_rpc_unittest.cc',
         '../../glue/dom_operations_unittest.cc',
         '../../glue/dom_serializer_unittest.cc',
         '../../glue/glue_serialize_unittest.cc',
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index 524aee8..1f6cdf7 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -335,6 +335,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\glue\devtools\devtools_rpc_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\glue\devtools\dom_agent_unittest.cc"
 				>
 			</File>