Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(554)

Unified Diff: content/shell/webkit_test_runner.cc

Issue 11189095: [content shell] reenable window.internals (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_runner.cc
diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc
index 45446e460ae603b88b72a408b65989c10756fd12..9970b398bba6c1cf18748abb51da15f970dc99ca 100644
--- a/content/shell/webkit_test_runner.cc
+++ b/content/shell/webkit_test_runner.cc
@@ -17,9 +17,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#ifdef WEBKIT_TESTING_SUPPORT_AVAILABLE
#include "third_party/WebKit/Source/WebKit/chromium/public/WebTestingSupport.h"
-#endif
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "webkit/glue/webkit_glue.h"
@@ -27,9 +25,7 @@ using WebKit::WebFrame;
using WebKit::WebElement;
using WebKit::WebRect;
using WebKit::WebSize;
-#ifdef WEBKIT_TESTING_SUPPORT_AVAILABLE
using WebKit::WebTestingSupport;
-#endif
using WebKit::WebView;
namespace content {
@@ -149,9 +145,7 @@ WebKitTestRunner::~WebKitTestRunner() {
}
void WebKitTestRunner::DidClearWindowObject(WebFrame* frame) {
-#ifdef WEBKIT_TESTING_SUPPORT_AVAILABLE
WebTestingSupport::injectInternalsObject(frame);
-#endif
}
void WebKitTestRunner::DidFinishLoad(WebFrame* frame) {
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698