| Index: content/shell/webkit_test_runner.h
|
| diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h
|
| index 4d891eb4b2be88c68d9c0d1f3d64267c1fdfa564..96f50dc3c9a7f76c5caaf2c654c61d372d95557a 100644
|
| --- a/content/shell/webkit_test_runner.h
|
| +++ b/content/shell/webkit_test_runner.h
|
| @@ -8,7 +8,6 @@
|
| #include "base/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentRequest.h"
|
| #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h"
|
| #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h"
|
| #include "v8/include/v8.h"
|
| @@ -63,10 +62,6 @@ class WebKitTestRunner : public RenderViewObserver,
|
| virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string& utf8_url);
|
| virtual ::WebTestRunner::WebPreferences* preferences();
|
| virtual void applyPreferences();
|
| -#if defined(ENABLE_WEB_INTENTS)
|
| - virtual void setCurrentWebIntentRequest(const WebKit::WebIntentRequest&);
|
| - virtual WebKit::WebIntentRequest* currentWebIntentRequest();
|
| -#endif
|
| virtual std::string makeURLErrorDescription(const WebKit::WebURLError& error);
|
|
|
| void Reset();
|
| @@ -117,10 +112,6 @@ class WebKitTestRunner : public RenderViewObserver,
|
|
|
| ::WebTestRunner::WebPreferences prefs_;
|
|
|
| -#if defined(ENABLE_WEB_INTENTS)
|
| - WebKit::WebIntentRequest intent_request_;
|
| -#endif
|
| -
|
| bool dump_editing_callbacks_;
|
| bool dump_frame_load_callbacks_;
|
| bool dump_user_gesture_in_frame_load_callbacks_;
|
|
|