diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2017-07-26 20:33:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 20:33:29 +0000 |
commit | a1771a41063d95079963aa1614a4e1a728f640d0 (patch) | |
tree | 0987cb51d27d74f7ff76c75683d6b504bac0e6d4 /base/trace_event/trace_event_argument_unittest.cc | |
parent | ca61a35797e9323748ace7b78ee93e192eae0048 (diff) | |
parent | 38bc769bac923a216e9381d720ba730bd7b2f5ef (diff) | |
download | libchrome-a1771a41063d95079963aa1614a4e1a728f640d0.tar.gz |
Revert "libchrome: Uprev the library to r456626 from Chromium" am: e5b2c6fa6f am: 54cfa4a2ba
am: 38bc769bac
Change-Id: I06b869627459f86aef391d6b0207e13a47b90499
Diffstat (limited to 'base/trace_event/trace_event_argument_unittest.cc')
-rw-r--r-- | base/trace_event/trace_event_argument_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/trace_event/trace_event_argument_unittest.cc b/base/trace_event/trace_event_argument_unittest.cc index aef8441c8e..61395f4d55 100644 --- a/base/trace_event/trace_event_argument_unittest.cc +++ b/base/trace_event/trace_event_argument_unittest.cc @@ -97,9 +97,9 @@ TEST(TraceEventArgumentTest, LongStrings) { } TEST(TraceEventArgumentTest, PassBaseValue) { - Value int_value(42); - Value bool_value(true); - Value double_value(42.0f); + FundamentalValue int_value(42); + FundamentalValue bool_value(true); + FundamentalValue double_value(42.0f); auto dict_value = WrapUnique(new DictionaryValue); dict_value->SetBoolean("bool", true); @@ -131,10 +131,10 @@ TEST(TraceEventArgumentTest, PassBaseValue) { } TEST(TraceEventArgumentTest, PassTracedValue) { - auto dict_value = MakeUnique<TracedValue>(); + auto dict_value = WrapUnique(new TracedValue()); dict_value->SetInteger("a", 1); - auto nested_dict_value = MakeUnique<TracedValue>(); + auto nested_dict_value = WrapUnique(new TracedValue()); nested_dict_value->SetInteger("b", 2); nested_dict_value->BeginArray("c"); nested_dict_value->AppendString("foo"); |