DevTools: load injected script using WebKit API. Now with test_shell working.

BUG=28062

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

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

2 files changed, 17 insertions, 0 deletions

diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index dd04b2e..04308cd 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -6,12 +6,15 @@
 #include "third_party/WebKit/WebKit/chromium/src/WebViewImpl.h"
 
 #undef LOG
+#include "grit/webkit_resources.h"
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_devtools_callargs.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
+#include "webkit/glue/webkit_glue.h"
 
 #include "base/message_loop.h"
 
+using WebKit::WebCString;
 using WebKit::WebDevToolsAgent;
 using WebKit::WebDevToolsMessageData;
 using WebKit::WebString;
@@ -60,6 +63,18 @@ void TestShellDevToolsAgent::runtimeFeatureStateChanged(
   // TODO(loislo): implement this.
 }
 
+WebCString TestShellDevToolsAgent::injectedScriptSource() {
+  base::StringPiece injectjsWebkit =
+      webkit_glue::GetDataResource(IDR_DEVTOOLS_INJECT_WEBKIT_JS);
+  return WebCString(injectjsWebkit.as_string().c_str());
+}
+
+WebCString TestShellDevToolsAgent::injectedScriptDispatcherSource() {
+  base::StringPiece injectDispatchjs =
+      webkit_glue::GetDataResource(IDR_DEVTOOLS_INJECT_DISPATCH_JS);
+  return WebCString(injectDispatchjs.as_string().c_str());
+}
+
 void TestShellDevToolsAgent::AsyncCall(const TestShellDevToolsCallArgs &args) {
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index 516ba14..9ce2498 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -32,6 +32,8 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
   virtual void forceRepaint();
   virtual void runtimeFeatureStateChanged(const WebKit::WebString& feature,
                                           bool enabled);
+  virtual WebKit::WebCString injectedScriptSource();
+  virtual WebKit::WebCString injectedScriptDispatcherSource();
 
   void AsyncCall(const TestShellDevToolsCallArgs& args);