| 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 "chrome/test/base/in_process_browser_test.h" | 5 #include "chrome/test/base/in_process_browser_test.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) | 75 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 76 #include "chrome/browser/captive_portal/captive_portal_service.h" | 76 #include "chrome/browser/captive_portal/captive_portal_service.h" |
| 77 #endif | 77 #endif |
| 78 | 78 |
| 79 #if !defined(OS_ANDROID) | 79 #if !defined(OS_ANDROID) |
| 80 #include "components/storage_monitor/test_storage_monitor.h" | 80 #include "components/storage_monitor/test_storage_monitor.h" |
| 81 #endif | 81 #endif |
| 82 | 82 |
| 83 #if defined(OS_CHROMEOS) | 83 #if defined(OS_CHROMEOS) |
| 84 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 84 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| 85 #endif | 85 #include "chrome/browser/ui/webui/options/browser_options_handler.h" |
| 86 #endif // defined(OS_CHROMEOS) |
| 86 | 87 |
| 87 #if defined(USE_ASH) | 88 #if defined(USE_ASH) |
| 88 #include "chrome/test/base/default_ash_event_generator_delegate.h" | 89 #include "chrome/test/base/default_ash_event_generator_delegate.h" |
| 89 #endif | 90 #endif |
| 90 | 91 |
| 91 #if !defined(OS_CHROMEOS) && defined(OS_LINUX) | 92 #if !defined(OS_CHROMEOS) && defined(OS_LINUX) |
| 92 #include "ui/views/test/test_desktop_screen_x11.h" | 93 #include "ui/views/test/test_desktop_screen_x11.h" |
| 93 #endif | 94 #endif |
| 94 | 95 |
| 95 namespace { | 96 namespace { |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) | 243 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 243 CaptivePortalService::set_state_for_testing( | 244 CaptivePortalService::set_state_for_testing( |
| 244 CaptivePortalService::DISABLED_FOR_TESTING); | 245 CaptivePortalService::DISABLED_FOR_TESTING); |
| 245 #endif | 246 #endif |
| 246 | 247 |
| 247 chrome_browser_net::NetErrorTabHelper::set_state_for_testing( | 248 chrome_browser_net::NetErrorTabHelper::set_state_for_testing( |
| 248 chrome_browser_net::NetErrorTabHelper::TESTING_FORCE_DISABLED); | 249 chrome_browser_net::NetErrorTabHelper::TESTING_FORCE_DISABLED); |
| 249 | 250 |
| 250 google_util::SetMockLinkDoctorBaseURLForTesting(); | 251 google_util::SetMockLinkDoctorBaseURLForTesting(); |
| 251 | 252 |
| 253 #if defined(OS_CHROMEOS) |
| 254 // Polymer Elements are used for quick unlock configuration in options page, |
| 255 // which is chromeos specific feature. |
| 256 options::BrowserOptionsHandler::DisablePolymerPreloadForTesting(); |
| 257 #endif // defined(OS_CHROMEOS) |
| 258 |
| 252 // Use hardcoded quota settings to have a consistent testing environment. | 259 // Use hardcoded quota settings to have a consistent testing environment. |
| 253 const int kQuota = 5 * 1024 * 1024; | 260 const int kQuota = 5 * 1024 * 1024; |
| 254 quota_settings_ = storage::QuotaSettings(kQuota * 5, kQuota, 0, 0); | 261 quota_settings_ = storage::QuotaSettings(kQuota * 5, kQuota, 0, 0); |
| 255 ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 262 ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 256 "a_settings_); | 263 "a_settings_); |
| 257 | 264 |
| 258 BrowserTestBase::SetUp(); | 265 BrowserTestBase::SetUp(); |
| 259 } | 266 } |
| 260 | 267 |
| 261 void InProcessBrowserTest::SetUpDefaultCommandLine( | 268 void InProcessBrowserTest::SetUpDefaultCommandLine( |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 // On the Mac, this eventually reaches | 621 // On the Mac, this eventually reaches |
| 615 // -[BrowserWindowController windowWillClose:], which will post a deferred | 622 // -[BrowserWindowController windowWillClose:], which will post a deferred |
| 616 // -autorelease on itself to ultimately destroy the Browser object. The line | 623 // -autorelease on itself to ultimately destroy the Browser object. The line |
| 617 // below is necessary to pump these pending messages to ensure all Browsers | 624 // below is necessary to pump these pending messages to ensure all Browsers |
| 618 // get deleted. | 625 // get deleted. |
| 619 content::RunAllPendingInMessageLoop(); | 626 content::RunAllPendingInMessageLoop(); |
| 620 delete autorelease_pool_; | 627 delete autorelease_pool_; |
| 621 autorelease_pool_ = NULL; | 628 autorelease_pool_ = NULL; |
| 622 #endif | 629 #endif |
| 623 } | 630 } |
| OLD | NEW |