content/browser/speech/speech_input_browsertest.cc - Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

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/browser/speech/speech_input_browsertest.cc

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 12 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/browser/renderer_host/resource_dispatcher_host_browsertest.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/speech/speech_input_browsertest.cc

===================================================================

--- content/browser/speech/speech_input_browsertest.cc (revision 116109)

+++ content/browser/speech/speech_input_browsertest.cc (working copy)

@@ -19,6 +19,8 @@

#include "content/public/common/speech_input_result.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"

+using content::WebContents;

namespace speech_input {

class FakeSpeechInputManager;

}

@@ -160,13 +162,13 @@

mouse_event.x = 0;

mouse_event.y = 0;

mouse_event.clickCount = 1;

- TabContents* tab_contents = browser()->GetSelectedTabContents();

+ WebContents* web_contents = browser()->GetSelectedWebContents();

ui_test_utils::WindowedNotificationObserver observer(

content::NOTIFICATION_LOAD_STOP,

- content::Source<NavigationController>(&tab_contents->GetController()));

- tab_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);

+ content::Source<NavigationController>(&web_contents->GetController()));

+ web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);

mouse_event.type = WebKit::WebInputEvent::MouseUp;

- tab_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);

+ web_contents->GetRenderViewHost()->ForwardMouseEvent(mouse_event);

observer.Wait();

}

@@ -176,7 +178,7 @@

// then sets the URL fragment as 'pass' if it received the expected string.

LoadAndStartSpeechInputTest(filename);

- EXPECT_EQ("pass", browser()->GetSelectedTabContents()->GetURL().ref());

+ EXPECT_EQ("pass", browser()->GetSelectedWebContents()->GetURL().ref());

}

// InProcessBrowserTest methods.