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

Side by Side Diff: base/scoped_generic_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/scoped_clear_errno_unittest.cc ('k') | base/scoped_native_library_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <vector> 5 #include <vector>
6 6
7 #include "base/scoped_generic.h" 7 #include "base/scoped_generic.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 struct IntTraits { 14 struct IntTraits {
15 IntTraits(std::vector<int>* freed) : freed_ints(freed) {} 15 IntTraits(std::vector<int>* freed) : freed_ints(freed) {}
16 16
17 static int InvalidValue() { 17 static int InvalidValue() {
18 return -1; 18 return -1;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 // Implicit conversion to bool shouldn't work. 162 // Implicit conversion to bool shouldn't work.
163 /*{ 163 /*{
164 ScopedInt a(kFirst, traits); 164 ScopedInt a(kFirst, traits);
165 bool result = a; 165 bool result = a;
166 }*/ 166 }*/
167 } 167 }
168 #endif 168 #endif
169 169
170 } // namespace base 170 } // namespace base
OLDNEW
« no previous file with comments | « base/scoped_clear_errno_unittest.cc ('k') | base/scoped_native_library_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698