OLD | NEW |
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/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 virtual void TearDown() OVERRIDE { | 269 virtual void TearDown() OVERRIDE { |
270 if (UsesFakeSpeech()) { | 270 if (UsesFakeSpeech()) { |
271 // SpeechRecognition test specific TearDown. | 271 // SpeechRecognition test specific TearDown. |
272 content::SpeechRecognitionManager::SetManagerForTesting(NULL); | 272 content::SpeechRecognitionManager::SetManagerForTesting(NULL); |
273 } | 273 } |
274 | 274 |
275 extensions::PlatformAppBrowserTest::TearDown(); | 275 extensions::PlatformAppBrowserTest::TearDown(); |
276 } | 276 } |
277 | 277 |
278 virtual void SetUpOnMainThread() OVERRIDE { | 278 virtual void SetUpOnMainThread() OVERRIDE { |
| 279 extensions::PlatformAppBrowserTest::SetUpOnMainThread(); |
279 const testing::TestInfo* const test_info = | 280 const testing::TestInfo* const test_info = |
280 testing::UnitTest::GetInstance()->current_test_info(); | 281 testing::UnitTest::GetInstance()->current_test_info(); |
281 // Mock out geolocation for geolocation specific tests. | 282 // Mock out geolocation for geolocation specific tests. |
282 if (!strncmp(test_info->name(), "GeolocationAPI", | 283 if (!strncmp(test_info->name(), "GeolocationAPI", |
283 strlen("GeolocationAPI"))) { | 284 strlen("GeolocationAPI"))) { |
284 ui_test_utils::OverrideGeolocation(10, 20); | 285 ui_test_utils::OverrideGeolocation(10, 20); |
285 } | 286 } |
286 } | 287 } |
287 | 288 |
288 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 289 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
(...skipping 1746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2035 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, | 2036 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, |
2036 WebViewCaptureTest, | 2037 WebViewCaptureTest, |
2037 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); | 2038 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); |
2038 #endif | 2039 #endif |
2039 | 2040 |
2040 #if defined(USE_AURA) || defined(OS_MACOSX) | 2041 #if defined(USE_AURA) || defined(OS_MACOSX) |
2041 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, | 2042 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, |
2042 WebViewCaptureTest, | 2043 WebViewCaptureTest, |
2043 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); | 2044 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); |
2044 #endif | 2045 #endif |
OLD | NEW |