content/renderer/render_view_browsertest.cc - Issue 12225076: Delete most web intents code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 12225076: Delete most web intents code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 10 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

Index: content/renderer/render_view_browsertest.cc

diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc

index b477ed7510693533ac83646e601d407b069ca2d4..6e39cc07bcdbdcd9b398c21298eaecc6337b2e79 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>");

« no previous file with comments | « content/public/browser/web_intents_dispatcher.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »