| 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/uma_histogram_helper.h" | 5 #include "chrome/test/base/uma_histogram_helper.h" |
| 6 #include "chrome/test/nacl/nacl_browsertest_util.h" | 6 #include "chrome/test/nacl/nacl_browsertest_util.h" |
| 7 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" | 7 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" |
| 8 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" | 8 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" |
| 9 | 9 |
| 10 namespace { | 10 namespace { |
| 11 | 11 |
| 12 // This test fails on Linux ASAN bots: <http://crbug.com/161709>. | 12 NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, { |
| 13 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER) | |
| 14 #define MAYBE_SuccessfulLoadUMA DISABLED_SuccessfulLoadUMA | |
| 15 #else | |
| 16 #define MAYBE_SuccessfulLoadUMA SuccessfulLoadUMA | |
| 17 #endif | |
| 18 | |
| 19 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_SuccessfulLoadUMA, { | |
| 20 // Load a NaCl module to generate UMA data. | 13 // Load a NaCl module to generate UMA data. |
| 21 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); | 14 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); |
| 22 | 15 |
| 23 // Make sure histograms from child processes have been accumulated in the | 16 // Make sure histograms from child processes have been accumulated in the |
| 24 // browser brocess. | 17 // browser brocess. |
| 25 UMAHistogramHelper histograms; | 18 UMAHistogramHelper histograms; |
| 26 histograms.Fetch(); | 19 histograms.Fetch(); |
| 27 | 20 |
| 28 // Did the plugin report success? | 21 // Did the plugin report success? |
| 29 histograms.ExpectUniqueSample("NaCl.LoadStatus.Plugin", | 22 histograms.ExpectUniqueSample("NaCl.LoadStatus.Plugin", |
| (...skipping 26 matching lines...) Expand all Loading... |
| 56 histograms.ExpectTotalCount( | 49 histograms.ExpectTotalCount( |
| 57 "NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec", 1); | 50 "NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec", 1); |
| 58 histograms.ExpectTotalCount("NaCl.Perf.PNaClCache.IsHit", 1); | 51 histograms.ExpectTotalCount("NaCl.Perf.PNaClCache.IsHit", 1); |
| 59 } | 52 } |
| 60 }) | 53 }) |
| 61 | 54 |
| 62 // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.) | 55 // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.) |
| 63 // Test validation failures and crashes. | 56 // Test validation failures and crashes. |
| 64 | 57 |
| 65 } // namespace anonymous | 58 } // namespace anonymous |
| OLD | NEW |