Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(652)

Side by Side Diff: chrome/browser/apps/speech_recognition_browsertest.cc

Issue 276993002: Revert 269271 "Mac Video Capture Device: split VCD into VCD and ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1984/src/
Patch Set: Created 6 years, 7 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 | « no previous file | chrome/browser/apps/web_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/apps/app_browsertest_util.h" 5 #include "chrome/browser/apps/app_browsertest_util.h"
6 #include "content/public/common/content_switches.h" 6 #include "content/public/common/content_switches.h"
7 #include "content/public/test/fake_speech_recognition_manager.h" 7 #include "content/public/test/fake_speech_recognition_manager.h"
8 #include "media/base/media_switches.h"
9 8
10 class SpeechRecognitionTest : public extensions::PlatformAppBrowserTest { 9 class SpeechRecognitionTest : public extensions::PlatformAppBrowserTest {
11 public: 10 public:
12 SpeechRecognitionTest() {} 11 SpeechRecognitionTest() {}
13 virtual ~SpeechRecognitionTest() {} 12 virtual ~SpeechRecognitionTest() {}
14 13
15 protected: 14 protected:
16 virtual void SetUp() OVERRIDE { 15 virtual void SetUp() OVERRIDE {
17 const testing::TestInfo* const test_info = 16 const testing::TestInfo* const test_info =
18 testing::UnitTest::GetInstance()->current_test_info(); 17 testing::UnitTest::GetInstance()->current_test_info();
(...skipping 29 matching lines...) Expand all
48 ASSERT_TRUE(RunPlatformAppTest("platform_apps/speech/background_page")) 47 ASSERT_TRUE(RunPlatformAppTest("platform_apps/speech/background_page"))
49 << message_; 48 << message_;
50 } 49 }
51 50
52 IN_PROC_BROWSER_TEST_F(SpeechRecognitionTest, 51 IN_PROC_BROWSER_TEST_F(SpeechRecognitionTest,
53 SpeechFromBackgroundPageWithoutPermission) { 52 SpeechFromBackgroundPageWithoutPermission) {
54 ASSERT_TRUE( 53 ASSERT_TRUE(
55 RunPlatformAppTest("platform_apps/speech/background_page_no_permission")) 54 RunPlatformAppTest("platform_apps/speech/background_page_no_permission"))
56 << message_; 55 << message_;
57 } 56 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/apps/web_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698