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

Side by Side Diff: testing/gtest_mac.mm

Issue 2856383002: Roll googletest to 1.7.0+. (Closed)
Patch Set: Rebase to get past http://crrev.com/2789433004 Created 3 years, 7 months 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 | « testing/gtest_mac.h ('k') | testing/gtest_mac_unittest.mm » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #import "gtest_mac.h" 5 #import "gtest_mac.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include <gtest/gtest.h> 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include <gtest/internal/gtest-port.h> 10 #include "third_party/googletest/src/googletest/include/gtest/internal/gtest-por t.h"
11 #include <gtest/internal/gtest-string.h> 11 #include "third_party/googletest/src/googletest/include/gtest/internal/gtest-str ing.h"
12 12
13 #ifdef GTEST_OS_MAC 13 #ifdef GTEST_OS_MAC
14 14
15 #import <Foundation/Foundation.h> 15 #import <Foundation/Foundation.h>
16 16
17 namespace testing { 17 namespace testing {
18 namespace internal { 18 namespace internal {
19 19
20 // Handles nil values for |obj| properly by using safe printing of %@ in 20 // Handles nil values for |obj| properly by using safe printing of %@ in
21 // -stringWithFormat:. 21 // -stringWithFormat:.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 return AssertionFailure(msg); 116 return AssertionFailure(msg);
117 117
118 } 118 }
119 119
120 #endif // !GTEST_OS_IOS 120 #endif // !GTEST_OS_IOS
121 121
122 } // namespace internal 122 } // namespace internal
123 } // namespace testing 123 } // namespace testing
124 124
125 #endif // GTEST_OS_MAC 125 #endif // GTEST_OS_MAC
OLDNEW
« no previous file with comments | « testing/gtest_mac.h ('k') | testing/gtest_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698