content/browser/speech/speech_input_browsertest.cc - Issue 9387023: Revert 121810 - Move SpeechRecognizer delegate into its own header file and put it in the content...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/speech/speech_input_browsertest.cc

Issue 9387023: Revert 121810 - Move SpeechRecognizer delegate into its own header file and put it in the content... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/speech/speech_input_extension_manager.cc ('k') | content/browser/speech/speech_input_manager.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/bind.h"	5 #include "base/bind.h"

6 #include "base/command_line.h"	6 #include "base/command_line.h"

7 #include "base/file_path.h"	7 #include "base/file_path.h"

8 #include "base/string_number_conversions.h"	8 #include "base/string_number_conversions.h"

9 #include "base/synchronization/waitable_event.h"

10 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

12 #include "chrome/test/base/in_process_browser_test.h"	11 #include "chrome/test/base/in_process_browser_test.h"

13 #include "chrome/test/base/ui_test_utils.h"	12 #include "chrome/test/base/ui_test_utils.h"

14 #include "content/browser/renderer_host/render_view_host.h"	13 #include "content/browser/renderer_host/render_view_host.h"

15 #include "content/browser/speech/speech_input_dispatcher_host.h"	14 #include "content/browser/speech/speech_input_dispatcher_host.h"

16 #include "content/browser/speech/speech_input_manager.h"	15 #include "content/browser/speech/speech_input_manager.h"

17 #include "content/browser/tab_contents/tab_contents.h"	16 #include "content/browser/tab_contents/tab_contents.h"

18 #include "content/public/browser/notification_types.h"	17 #include "content/public/browser/notification_types.h"

19 #include "content/public/common/content_switches.h"	18 #include "content/public/common/content_switches.h"

(...skipping 235 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
255	254

256 // Make the renderer crash. This should trigger SpeechInputDispatcherHost to	255 // Make the renderer crash. This should trigger SpeechInputDispatcherHost to

257 // cancel all pending sessions.	256 // cancel all pending sessions.

258 GURL test_url("about:crash");	257 GURL test_url("about:crash");

259 ui_test_utils::NavigateToURL(browser(), test_url);	258 ui_test_utils::NavigateToURL(browser(), test_url);

260	259

261 EXPECT_TRUE(fake_speech_input_manager_.did_cancel_all());	260 EXPECT_TRUE(fake_speech_input_manager_.did_cancel_all());

262 }	261 }

263	262

264 } // namespace speech_input	263 } // namespace speech_input

OLD	NEW