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

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

Unified Diff: base/trace_event/trace_event_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:

Index: base/trace_event/trace_event_unittest.cc

diff --git a/base/trace_event/trace_event_unittest.cc b/base/trace_event/trace_event_unittest.cc

index 084c25011319367958049d3bd41a3453ae6b6797..51f340493a5faf101cd65ef697b21beff0d70cc0 100644

--- a/base/trace_event/trace_event_unittest.cc

+++ b/base/trace_event/trace_event_unittest.cc

@@ -25,8 +25,8 @@

#include "base/trace_event/trace_event.h"

#include "base/trace_event/trace_event_synthetic_delay.h"

#include "base/values.h"

-#include "testing/gmock/include/gmock/gmock.h"

-#include "testing/gtest/include/gtest/gtest.h"

+#include "testing/gtest/googlemock/include/gmock/gmock.h"

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

namespace base {

namespace trace_event {