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

Side by Side Diff: base/cancelable_callback_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/callback_unittest.cc ('k') | base/command_line_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/cancelable_callback.h" 5 #include "base/cancelable_callback.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/googletest/include/gtest/gtest.h"
15 15
16 namespace base { 16 namespace base {
17 namespace { 17 namespace {
18 18
19 class TestRefCounted : public RefCountedThreadSafe<TestRefCounted> { 19 class TestRefCounted : public RefCountedThreadSafe<TestRefCounted> {
20 private: 20 private:
21 friend class RefCountedThreadSafe<TestRefCounted>; 21 friend class RefCountedThreadSafe<TestRefCounted>;
22 ~TestRefCounted() {}; 22 ~TestRefCounted() {};
23 }; 23 };
24 24
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 // Cancel before running the message loop. 177 // Cancel before running the message loop.
178 cancelable.Cancel(); 178 cancelable.Cancel();
179 RunLoop().RunUntilIdle(); 179 RunLoop().RunUntilIdle();
180 180
181 // Callback never ran due to cancellation; count is the same. 181 // Callback never ran due to cancellation; count is the same.
182 EXPECT_EQ(1, count); 182 EXPECT_EQ(1, count);
183 } 183 }
184 184
185 } // namespace 185 } // namespace
186 } // namespace base 186 } // namespace base
OLDNEW
« no previous file with comments | « base/callback_unittest.cc ('k') | base/command_line_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698