base/metrics/histogram_macros_unittest.cc - Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: base/metrics/histogram_macros_unittest.cc

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/metrics/histogram_macros.h"	5 #include "base/metrics/histogram_macros.h"

6 #include "base/time/time.h"	6 #include "base/time/time.h"

7 #include "testing/gtest/include/gtest/gtest.h"	7 #include "testing/gtest/googletest/include/gtest/gtest.h"

8	8

9 namespace base {	9 namespace base {

10	10

11 TEST(ScopedHistogramTimer, TwoTimersOneScope) {	11 TEST(ScopedHistogramTimer, TwoTimersOneScope) {

12 SCOPED_UMA_HISTOGRAM_TIMER("TestTimer0");	12 SCOPED_UMA_HISTOGRAM_TIMER("TestTimer0");

13 SCOPED_UMA_HISTOGRAM_TIMER("TestTimer1");	13 SCOPED_UMA_HISTOGRAM_TIMER("TestTimer1");

14 SCOPED_UMA_HISTOGRAM_LONG_TIMER("TestLongTimer0");	14 SCOPED_UMA_HISTOGRAM_LONG_TIMER("TestLongTimer0");

15 SCOPED_UMA_HISTOGRAM_LONG_TIMER("TestLongTimer1");	15 SCOPED_UMA_HISTOGRAM_LONG_TIMER("TestLongTimer1");

16 }	16 }

17	17

18 } // namespace base	18 } // namespace base

OLD	NEW