summaryrefslogtreecommitdiffstats
path: root/ppapi/tests
diff options
context:
space:
mode:
authorelijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 20:49:34 +0000
committerelijahtaylor@chromium.org <elijahtaylor@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-24 20:49:34 +0000
commit4564949f87f10dc504993080785fa1fbb60bb978 (patch)
tree18b622d0656fb4c7a2f7ecce39a596a0b43b80a7 /ppapi/tests
parentcba826490cd939ae2f22363c5163517017c5a7d0 (diff)
downloadchromium_src-4564949f87f10dc504993080785fa1fbb60bb978.zip
chromium_src-4564949f87f10dc504993080785fa1fbb60bb978.tar.gz
chromium_src-4564949f87f10dc504993080785fa1fbb60bb978.tar.bz2
Proxy private UMA pepper interface for out-of-process and NaCl plugins.
BUG=317833 Review URL: https://codereview.chromium.org/61643022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests')
-rw-r--r--ppapi/tests/test_uma.cc29
1 files changed, 16 insertions, 13 deletions
diff --git a/ppapi/tests/test_uma.cc b/ppapi/tests/test_uma.cc
index 8892bea..ef21005 100644
--- a/ppapi/tests/test_uma.cc
+++ b/ppapi/tests/test_uma.cc
@@ -25,31 +25,34 @@ void TestUMA::RunTests(const std::string& filter) {
std::string TestUMA::TestCount() {
pp::Var name_var = pp::Var("Test.CountHistogram");
PP_Var name = name_var.pp_var();
- uma_interface_->HistogramCustomCounts(name, 10, 1, 100, 50);
- uma_interface_->HistogramCustomCounts(name, 30, 1, 100, 50);
- uma_interface_->HistogramCustomCounts(name, 20, 1, 100, 50);
- uma_interface_->HistogramCustomCounts(name, 40, 1, 100, 50);
+ PP_Instance instance = instance_->pp_instance();
+ uma_interface_->HistogramCustomCounts(instance, name, 10, 1, 100, 50);
+ uma_interface_->HistogramCustomCounts(instance, name, 30, 1, 100, 50);
+ uma_interface_->HistogramCustomCounts(instance, name, 20, 1, 100, 50);
+ uma_interface_->HistogramCustomCounts(instance, name, 40, 1, 100, 50);
PASS();
}
std::string TestUMA::TestTime() {
pp::Var name_var = pp::Var("Test.TimeHistogram");
PP_Var name = name_var.pp_var();
- uma_interface_->HistogramCustomTimes(name, 100, 1, 10000, 50);
- uma_interface_->HistogramCustomTimes(name, 1000, 1, 10000, 50);
- uma_interface_->HistogramCustomTimes(name, 5000, 1, 10000, 50);
- uma_interface_->HistogramCustomTimes(name, 10, 1, 10000, 50);
+ PP_Instance instance = instance_->pp_instance();
+ uma_interface_->HistogramCustomTimes(instance, name, 100, 1, 10000, 50);
+ uma_interface_->HistogramCustomTimes(instance, name, 1000, 1, 10000, 50);
+ uma_interface_->HistogramCustomTimes(instance, name, 5000, 1, 10000, 50);
+ uma_interface_->HistogramCustomTimes(instance, name, 10, 1, 10000, 50);
PASS();
}
std::string TestUMA::TestEnum() {
pp::Var name_var = pp::Var("Test.EnumHistogram");
PP_Var name = name_var.pp_var();
- uma_interface_->HistogramEnumeration(name, 0, 5);
- uma_interface_->HistogramEnumeration(name, 3, 5);
- uma_interface_->HistogramEnumeration(name, 3, 5);
- uma_interface_->HistogramEnumeration(name, 1, 5);
- uma_interface_->HistogramEnumeration(name, 2, 5);
+ PP_Instance instance = instance_->pp_instance();
+ uma_interface_->HistogramEnumeration(instance, name, 0, 5);
+ uma_interface_->HistogramEnumeration(instance, name, 3, 5);
+ uma_interface_->HistogramEnumeration(instance, name, 3, 5);
+ uma_interface_->HistogramEnumeration(instance, name, 1, 5);
+ uma_interface_->HistogramEnumeration(instance, name, 2, 5);
PASS();
}