| 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 <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 // Read out the results. | 225 // Read out the results. |
| 226 std::wstring json; | 226 std::wstring json; |
| 227 ASSERT_TRUE(tab->ExecuteAndExtractString( | 227 ASSERT_TRUE(tab->ExecuteAndExtractString( |
| 228 L"", | 228 L"", |
| 229 L"window.domAutomationController.send(" | 229 L"window.domAutomationController.send(" |
| 230 L"JSON.stringify(__calc_results_total()));", | 230 L"JSON.stringify(__calc_results_total()));", |
| 231 &json)); | 231 &json)); |
| 232 | 232 |
| 233 std::map<std::string, std::string> results; | 233 std::map<std::string, std::string> results; |
| 234 ASSERT_TRUE(JsonDictionaryToMap(WideToUTF8(json), &results)); | 234 ASSERT_TRUE(JsonDictionaryToMap(base::WideToUTF8(json), &results)); |
| 235 | 235 |
| 236 ASSERT_TRUE(results.find("mean") != results.end()); | 236 ASSERT_TRUE(results.find("mean") != results.end()); |
| 237 ASSERT_TRUE(results.find("sigma") != results.end()); | 237 ASSERT_TRUE(results.find("sigma") != results.end()); |
| 238 ASSERT_TRUE(results.find("gestures") != results.end()); | 238 ASSERT_TRUE(results.find("gestures") != results.end()); |
| 239 ASSERT_TRUE(results.find("means") != results.end()); | 239 ASSERT_TRUE(results.find("means") != results.end()); |
| 240 ASSERT_TRUE(results.find("sigmas") != results.end()); | 240 ASSERT_TRUE(results.find("sigmas") != results.end()); |
| 241 | 241 |
| 242 std::string trace_name = "interval" + GetSuffixForTestFlags(); | 242 std::string trace_name = "interval" + GetSuffixForTestFlags(); |
| 243 printf("GESTURES %s: %s= [%s] [%s] [%s]\n", name.c_str(), | 243 printf("GESTURES %s: %s= [%s] [%s] [%s]\n", name.c_str(), |
| 244 trace_name.c_str(), | 244 trace_name.c_str(), |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, | 310 kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync, |
| 311 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, | 311 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu, |
| 312 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | | 312 kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | |
| 313 kDisableVsync)); | 313 kDisableVsync)); |
| 314 | 314 |
| 315 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) | 315 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies) |
| 316 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) | 316 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE) |
| 317 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) | 317 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading) |
| 318 | 318 |
| 319 } // namespace | 319 } // namespace |
| OLD | NEW |