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 "base/test/histogram_tester.h" | 5 #include "base/test/histogram_tester.h" |
6 #include "chrome/test/nacl/nacl_browsertest_util.h" | 6 #include "chrome/test/nacl/nacl_browsertest_util.h" |
7 #include "components/nacl/browser/nacl_browser.h" | 7 #include "components/nacl/browser/nacl_browser.h" |
| 8 #include "components/nacl/renderer/ppb_nacl_private.h" |
8 #include "content/public/test/browser_test_utils.h" | 9 #include "content/public/test/browser_test_utils.h" |
9 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" | 10 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" |
10 #include "ppapi/c/private/ppb_nacl_private.h" | |
11 | 11 |
12 namespace { | 12 namespace { |
13 | 13 |
14 NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, { | 14 NACL_BROWSER_TEST_F(NaClBrowserTest, SuccessfulLoadUMA, { |
15 base::HistogramTester histograms; | 15 base::HistogramTester histograms; |
16 // Load a NaCl module to generate UMA data. | 16 // Load a NaCl module to generate UMA data. |
17 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); | 17 RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html")); |
18 | 18 |
19 // Make sure histograms from child processes have been accumulated in the | 19 // Make sure histograms from child processes have been accumulated in the |
20 // browser brocess. | 20 // browser brocess. |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 // No extra cache settings. | 213 // No extra cache settings. |
214 histograms.ExpectUniqueSample("NaCl.ValidationCache.Set", | 214 histograms.ExpectUniqueSample("NaCl.ValidationCache.Set", |
215 nacl::NaClBrowser::CACHE_HIT, 3); | 215 nacl::NaClBrowser::CACHE_HIT, 3); |
216 } | 216 } |
217 | 217 |
218 | 218 |
219 // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.) | 219 // TODO(ncbray) convert the rest of nacl_uma.py (currently in the NaCl repo.) |
220 // Test validation failures and crashes. | 220 // Test validation failures and crashes. |
221 | 221 |
222 } // namespace | 222 } // namespace |
OLD | NEW |