Index: chrome/browser/extensions/app_background_page_apitest.cc |
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc |
index 1ed528918aab6a0399058b08caf7e7557eda40d5..864a503a06d759c1fd044d39d9097fb1fcb452cc 100644 |
--- a/chrome/browser/extensions/app_background_page_apitest.cc |
+++ b/chrome/browser/extensions/app_background_page_apitest.cc |
@@ -128,15 +128,13 @@ class AppBackgroundPageNaClTest : public AppBackgroundPageApiTest { |
virtual ~AppBackgroundPageNaClTest() { |
} |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
- AppBackgroundPageApiTest::SetUpCommandLine(command_line); |
+ virtual void SetUpOnMainThread() OVERRIDE { |
+ AppBackgroundPageApiTest::SetUpOnMainThread(); |
#if !defined(DISABLE_NACL) |
nacl::NaClProcessHost::SetPpapiKeepAliveThrottleForTesting(50); |
#endif |
- command_line->AppendSwitchASCII( |
- extensions::switches::kEventPageIdleTime, "1000"); |
- command_line->AppendSwitchASCII( |
- extensions::switches::kEventPageSuspendingTime, "1000"); |
+ extensions::ProcessManager::SetEventPageIdleTimeForTesting(100); |
Devlin
2014/09/05 22:06:07
include?
Yoyo Zhou
2014/09/08 16:19:10
Done.
|
+ extensions::ProcessManager::SetEventPageSuspendingTimeForTesting(100); |
} |
const Extension* extension() { return extension_; } |
@@ -146,7 +144,7 @@ class AppBackgroundPageNaClTest : public AppBackgroundPageApiTest { |
base::FilePath app_dir; |
PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir); |
app_dir = app_dir.AppendASCII( |
- "ppapi/tests/extensions/background_keepalive/newlib"); |
+ "ppapi/tests/extensions/background_keepalive/newlib"); |
extension_ = LoadExtension(app_dir); |
ASSERT_TRUE(extension_); |
} |
@@ -651,4 +649,3 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageNaClTest, |
idle_impulse_counter.Wait(); |
#endif |
} |
- |