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

Side by Side Diff: base/threading/thread_local_storage_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
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 #if defined(OS_WIN) 5 #if defined(OS_WIN)
6 #include <windows.h> 6 #include <windows.h>
7 #include <process.h> 7 #include <process.h>
8 #endif 8 #endif
9 9
10 #include "base/threading/simple_thread.h" 10 #include "base/threading/simple_thread.h"
11 #include "base/threading/thread_local_storage.h" 11 #include "base/threading/thread_local_storage.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/googletest/include/gtest/gtest.h"
13 13
14 #if defined(OS_WIN) 14 #if defined(OS_WIN)
15 // Ignore warnings about ptr->int conversions that we use when 15 // Ignore warnings about ptr->int conversions that we use when
16 // storing ints into ThreadLocalStorage. 16 // storing ints into ThreadLocalStorage.
17 #pragma warning(disable : 4311 4312) 17 #pragma warning(disable : 4311 4312)
18 #endif 18 #endif
19 19
20 namespace base { 20 namespace base {
21 21
22 namespace { 22 namespace {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 delete threads[index]; 119 delete threads[index];
120 delete thread_delegates[index]; 120 delete thread_delegates[index];
121 121
122 // Verify that the destructor was called and that we reset. 122 // Verify that the destructor was called and that we reset.
123 EXPECT_EQ(values[index], kFinalTlsValue); 123 EXPECT_EQ(values[index], kFinalTlsValue);
124 } 124 }
125 tls_slot.Free(); // Stop doing callbacks to cleanup threads. 125 tls_slot.Free(); // Stop doing callbacks to cleanup threads.
126 } 126 }
127 127
128 } // namespace base 128 } // namespace base
OLDNEW
« no previous file with comments | « base/threading/thread_id_name_manager_unittest.cc ('k') | base/threading/thread_local_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698