Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Side by Side Diff: base/tuple_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:
View unified diff | Download patch
« no previous file with comments | « base/tracked_objects_unittest.cc ('k') | base/values_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/tuple.h" 5 #include "base/tuple.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/googletest/include/gtest/gtest.h"
9 9
10 namespace base { 10 namespace base {
11 11
12 namespace { 12 namespace {
13 13
14 void DoAdd(int a, int b, int c, int* res) { 14 void DoAdd(int a, int b, int c, int* res) {
15 *res = a + b + c; 15 *res = a + b + c;
16 } 16 }
17 17
18 struct Addy { 18 struct Addy {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 // Now they should be different, since the function call will make a copy. 126 // Now they should be different, since the function call will make a copy.
127 res = false; 127 res = false;
128 DispatchToFunction(&SomeLoggerMethCopy, tuple); 128 DispatchToFunction(&SomeLoggerMethCopy, tuple);
129 EXPECT_FALSE(res); 129 EXPECT_FALSE(res);
130 EXPECT_EQ(3, CopyLogger::TimesConstructed); 130 EXPECT_EQ(3, CopyLogger::TimesConstructed);
131 EXPECT_EQ(2, CopyLogger::TimesCopied); 131 EXPECT_EQ(2, CopyLogger::TimesCopied);
132 } 132 }
133 133
134 } // namespace base 134 } // namespace base
OLDNEW
« no previous file with comments | « base/tracked_objects_unittest.cc ('k') | base/values_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698