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

Side by Side Diff: base/android/scoped_java_ref_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/android/path_utils_unittest.cc ('k') | base/android/sys_utils.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/android/scoped_java_ref.h" 5 #include "base/android/scoped_java_ref.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/googletest/include/gtest/gtest.h"
10 10
11 namespace base { 11 namespace base {
12 namespace android { 12 namespace android {
13 13
14 namespace { 14 namespace {
15 int g_local_refs = 0; 15 int g_local_refs = 0;
16 int g_global_refs = 0; 16 int g_global_refs = 0;
17 17
18 const JNINativeInterface* g_previous_functions; 18 const JNINativeInterface* g_previous_functions;
19 19
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ScopedJavaGlobalRef<jobject> global_obj2(global_obj); 113 ScopedJavaGlobalRef<jobject> global_obj2(global_obj);
114 EXPECT_EQ(2, g_global_refs); 114 EXPECT_EQ(2, g_global_refs);
115 } 115 }
116 116
117 EXPECT_EQ(0, g_local_refs); 117 EXPECT_EQ(0, g_local_refs);
118 EXPECT_EQ(0, g_global_refs); 118 EXPECT_EQ(0, g_global_refs);
119 } 119 }
120 120
121 } // namespace android 121 } // namespace android
122 } // namespace base 122 } // namespace base
OLDNEW
« no previous file with comments | « base/android/path_utils_unittest.cc ('k') | base/android/sys_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698