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

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

Issue 22797008: Force delegated renderer on Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix whitespace Created 7 years, 3 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_interactive_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 "apps/native_app_window.h" 5 #include "apps/native_app_window.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/apps/app_browsertest_util.h" 8 #include "chrome/browser/apps/app_browsertest_util.h"
9 #include "chrome/browser/automation/automation_util.h" 9 #include "chrome/browser/automation/automation_util.h"
10 #include "chrome/browser/extensions/extension_test_message_listener.h" 10 #include "chrome/browser/extensions/extension_test_message_listener.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 if (!strcmp(test_info->name(), "SpeechRecognition")) { 225 if (!strcmp(test_info->name(), "SpeechRecognition")) {
226 fake_speech_recognition_manager_.reset( 226 fake_speech_recognition_manager_.reset(
227 new content::FakeSpeechRecognitionManager()); 227 new content::FakeSpeechRecognitionManager());
228 fake_speech_recognition_manager_->set_should_send_fake_response(true); 228 fake_speech_recognition_manager_->set_should_send_fake_response(true);
229 // Inject the fake manager factory so that the test result is returned to 229 // Inject the fake manager factory so that the test result is returned to
230 // the web page. 230 // the web page.
231 content::SpeechRecognitionManager::SetManagerForTests( 231 content::SpeechRecognitionManager::SetManagerForTests(
232 fake_speech_recognition_manager_.get()); 232 fake_speech_recognition_manager_.get());
233 } 233 }
234 234
235 // We need real contexts, otherwise the embedder doesn't composite, but the
236 // guest does, and that isn't an expected configuration.
237 UseRealGLContexts();
235 extensions::PlatformAppBrowserTest::SetUp(); 238 extensions::PlatformAppBrowserTest::SetUp();
236 } 239 }
237 240
238 virtual void TearDown() OVERRIDE { 241 virtual void TearDown() OVERRIDE {
239 // SpeechRecognition test specific TearDown. 242 // SpeechRecognition test specific TearDown.
240 const testing::TestInfo* const test_info = 243 const testing::TestInfo* const test_info =
241 testing::UnitTest::GetInstance()->current_test_info(); 244 testing::UnitTest::GetInstance()->current_test_info();
242 if (!strcmp(test_info->name(), "SpeechRecognition")) 245 if (!strcmp(test_info->name(), "SpeechRecognition"))
243 content::SpeechRecognitionManager::SetManagerForTests(NULL); 246 content::SpeechRecognitionManager::SetManagerForTests(NULL);
244 247
(...skipping 1405 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 "DoneDialogTest.FAILED", 1653 "DoneDialogTest.FAILED",
1651 "web_view/dialog"); 1654 "web_view/dialog");
1652 } 1655 }
1653 1656
1654 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { 1657 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) {
1655 TestHelper("testPromptDialog", 1658 TestHelper("testPromptDialog",
1656 "DoneDialogTest.PASSED", 1659 "DoneDialogTest.PASSED",
1657 "DoneDialogTest.FAILED", 1660 "DoneDialogTest.FAILED",
1658 "web_view/dialog"); 1661 "web_view/dialog");
1659 } 1662 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/apps/web_view_interactive_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698