| Index: chrome/test/base/in_process_browser_test.cc
|
| diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
|
| index 11abd4407ea0ffa15d31cdd08f686458f2fa129c..45c8e2df8573450bd1eed05b6a26ecc4c8e44c40 100644
|
| --- a/chrome/test/base/in_process_browser_test.cc
|
| +++ b/chrome/test/base/in_process_browser_test.cc
|
| @@ -82,7 +82,8 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
|
| -#endif
|
| +#include "chrome/browser/ui/webui/options/browser_options_handler.h"
|
| +#endif // defined(OS_CHROMEOS)
|
|
|
| #if defined(USE_ASH)
|
| #include "chrome/test/base/default_ash_event_generator_delegate.h"
|
| @@ -249,6 +250,12 @@ void InProcessBrowserTest::SetUp() {
|
|
|
| google_util::SetMockLinkDoctorBaseURLForTesting();
|
|
|
| +#if defined(OS_CHROMEOS)
|
| + // Polymer Elements are used for quick unlock configuration in options page,
|
| + // which is chromeos specific feature.
|
| + options::BrowserOptionsHandler::DisablePolymerPreloadForTesting();
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| // Use hardcoded quota settings to have a consistent testing environment.
|
| const int kQuota = 5 * 1024 * 1024;
|
| quota_settings_ = storage::QuotaSettings(kQuota * 5, kQuota, 0, 0);
|
|
|