diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 02:47:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 02:47:39 +0000 |
| commit | c2818d44191bc4342c2ae322f3e0cb218dd2ec66 (patch) | |
| tree | de6265a7e8506e6df679a436cb4df1cd7281a614 /testing | |
| parent | e8b53808f5251d1486dd8b992fa94d96bb604e01 (diff) | |
| download | chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.zip chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.tar.gz chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.tar.bz2 | |
Move scoped_nsdisable_screen_update from base to app/mac
Move scoped_aedesc from base to base/mac
Use namespace and proper Google-style class naming.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3828009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gtest_mac_unittest.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testing/gtest_mac_unittest.mm b/testing/gtest_mac_unittest.mm index 552beee..c5bc47f 100644 --- a/testing/gtest_mac_unittest.mm +++ b/testing/gtest_mac_unittest.mm @@ -10,12 +10,12 @@ #import <Foundation/Foundation.h> -#include "base/scoped_nsautorelease_pool.h" +#include "base/mac/scoped_nsautorelease_pool.h" #include "testing/gtest/include/gtest/internal/gtest-port.h" #include "testing/gtest/include/gtest/gtest.h" TEST(GTestMac, ExpectNSEQ) { - base::ScopedNSAutoreleasePool pool; + base::mac::ScopedNSAutoreleasePool pool; EXPECT_NSEQ(@"a", @"a"); @@ -26,7 +26,7 @@ TEST(GTestMac, ExpectNSEQ) { } TEST(GTestMac, AssertNSEQ) { - base::ScopedNSAutoreleasePool pool; + base::mac::ScopedNSAutoreleasePool pool; NSNumber* n1 = [NSNumber numberWithInt:42]; NSNumber* n2 = [NSNumber numberWithInt:42]; @@ -35,13 +35,13 @@ TEST(GTestMac, AssertNSEQ) { } TEST(GTestMac, ExpectNSNE) { - base::ScopedNSAutoreleasePool pool; + base::mac::ScopedNSAutoreleasePool pool; EXPECT_NSNE([NSNumber numberWithInt:2], [NSNumber numberWithInt:42]); } TEST(GTestMac, AssertNSNE) { - base::ScopedNSAutoreleasePool pool; + base::mac::ScopedNSAutoreleasePool pool; ASSERT_NSNE(@"a", @"b"); } |