base/threading/non_thread_safe_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/threading/non_thread_safe_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/threading/non_thread_safe_unittest.cc

diff --git a/base/threading/non_thread_safe_unittest.cc b/base/threading/non_thread_safe_unittest.cc

index 955c939d92d85924d5fd6a189c3424fb6bdcc0a6..cd258490989b4cd471f4cac752e7dcd0f00b6520 100644

--- a/base/threading/non_thread_safe_unittest.cc

+++ b/base/threading/non_thread_safe_unittest.cc

@@ -7,7 +7,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/threading/non_thread_safe.h"

#include "base/threading/simple_thread.h"

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

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

// Duplicated from base/threading/non_thread_safe.h so that we can be

// good citizens there and undef the macro.

« no previous file with comments | « base/test/values_test_util.cc ('k') | base/threading/platform_thread_unittest.cc » ('j') | no next file with comments »