diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:00:57 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:00:57 +0000 |
| commit | 8427a062d29aa762bf11a3384bb6c02fa2395b16 (patch) | |
| tree | 64fa1d2e4f39330eb0960cfe87c374e6be34b296 /content/renderer/render_view_browsertest.cc | |
| parent | 574268ef75cf34e46b268ea035ace78b7c4b2dad (diff) | |
| download | chromium_src-8427a062d29aa762bf11a3384bb6c02fa2395b16.zip chromium_src-8427a062d29aa762bf11a3384bb6c02fa2395b16.tar.gz chromium_src-8427a062d29aa762bf11a3384bb6c02fa2395b16.tar.bz2 | |
Delete most web intents code.
It's already disabled, so this should have no observable effect.
The database code stays around until I've written a migration to delete the
webintents table.
The apps schema code stays around so that 'intent' blocks in apps are
silently ignored instead of causing an error.
BUG=173194
TBR=piman
Review URL: https://codereview.chromium.org/12225076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_browsertest.cc')
| -rw-r--r-- | content/renderer/render_view_browsertest.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index b477ed7..6e39cc0 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -7,7 +7,6 @@ #include "base/shared_memory.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/common/intents_messages.h" #include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/web_ui_controller_factory.h" @@ -25,7 +24,6 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebIntentServiceInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -1583,32 +1581,6 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) { EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[3]); } -#if defined(ENABLE_WEB_INTENTS) -TEST_F(RenderViewImplTest, FindTitleForIntentsPage) { - view()->set_send_content_state_immediately(true); - LoadHTML("<html><head><title>title</title>" - "<intent action=\"a\" type=\"t\"></intent></head></html>"); - WebKit::WebIntentServiceInfo service; - service.setAction(ASCIIToUTF16("a")); - service.setType(ASCIIToUTF16("t")); - view()->registerIntentService(GetMainFrame(), service); - ProcessPendingMessages(); - - EXPECT_TRUE(render_thread_->sink().GetUniqueMessageMatching( - IntentsHostMsg_RegisterIntentService::ID)); - const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching( - IntentsHostMsg_RegisterIntentService::ID); - ASSERT_TRUE(msg); - webkit_glue::WebIntentServiceData service_data; - bool user_gesture = true; - IntentsHostMsg_RegisterIntentService::Read(msg, &service_data, &user_gesture); - EXPECT_EQ(ASCIIToUTF16("a"), service_data.action); - EXPECT_EQ(ASCIIToUTF16("t"), service_data.type); - EXPECT_EQ(ASCIIToUTF16("title"), service_data.title); - EXPECT_FALSE(user_gesture); -} -#endif - TEST_F(RenderViewImplTest, ContextMenu) { LoadHTML("<div>Page A</div>"); |