| Index: chrome/test/perf/frame_rate/frame_rate_tests.cc
|
| diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
|
| index 7be2b36e8beedc84b9c647c5b84c3354f7336532..7b36b2708c064e64a730d4c174171c71d1e0bf6f 100644
|
| --- a/chrome/test/perf/frame_rate/frame_rate_tests.cc
|
| +++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc
|
| @@ -196,8 +196,10 @@ class FrameRateTest
|
| // race condition caused by an html redirect. If that is the case, verify
|
| // that flag kHasRedirect is enabled for the current test.
|
| ASSERT_TRUE(WaitUntilJavaScriptCondition(
|
| - tab, L"", L"window.domAutomationController.send(__initialized);",
|
| - TestTimeouts::large_test_timeout()));
|
| + tab,
|
| + std::wstring(),
|
| + L"window.domAutomationController.send(__initialized);",
|
| + TestTimeouts::large_test_timeout()));
|
|
|
| if (HasFlag(kForceGpuComposited)) {
|
| ASSERT_TRUE(tab->NavigateToURLAsync(
|
| @@ -209,7 +211,9 @@ class FrameRateTest
|
|
|
| // Block until the tests completes.
|
| ASSERT_TRUE(WaitUntilJavaScriptCondition(
|
| - tab, L"", L"window.domAutomationController.send(!__running_all);",
|
| + tab,
|
| + std::wstring(),
|
| + L"window.domAutomationController.send(!__running_all);",
|
| TestTimeouts::large_test_timeout()));
|
|
|
| // TODO(jbates): remove this check when ref builds are updated.
|
| @@ -225,7 +229,7 @@ class FrameRateTest
|
| // Read out the results.
|
| std::wstring json;
|
| ASSERT_TRUE(tab->ExecuteAndExtractString(
|
| - L"",
|
| + std::wstring(),
|
| L"window.domAutomationController.send("
|
| L"JSON.stringify(__calc_results_total()));",
|
| &json));
|
| @@ -247,8 +251,12 @@ class FrameRateTest
|
| results["sigmas"].c_str());
|
|
|
| std::string mean_and_error = results["mean"] + "," + results["sigma"];
|
| - perf_test::PrintResultMeanAndError(name, "", trace_name, mean_and_error,
|
| - "milliseconds-per-frame", true);
|
| + perf_test::PrintResultMeanAndError(name,
|
| + std::string(),
|
| + trace_name,
|
| + mean_and_error,
|
| + "milliseconds-per-frame",
|
| + true);
|
|
|
| // Navigate back to NTP so that we can quit without timing out during the
|
| // wait-for-idle stage in test framework.
|
|
|