summaryrefslogtreecommitdiffstats
path: root/base/test/test_suite.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 02:47:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 02:47:39 +0000
commitc2818d44191bc4342c2ae322f3e0cb218dd2ec66 (patch)
treede6265a7e8506e6df679a436cb4df1cd7281a614 /base/test/test_suite.cc
parente8b53808f5251d1486dd8b992fa94d96bb604e01 (diff)
downloadchromium_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 'base/test/test_suite.cc')
-rw-r--r--base/test/test_suite.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index a08bbd9..f2e6069 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -13,10 +13,10 @@
#include "base/file_path.h"
#include "base/i18n/icu_util.h"
#include "base/logging.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/nss_util.h"
#include "base/path_service.h"
#include "base/process_util.h"
-#include "base/scoped_nsautorelease_pool.h"
#include "base/scoped_ptr.h"
#include "base/test/multiprocess_test.h"
#include "base/test/test_timeouts.h"
@@ -113,7 +113,7 @@ void TestSuite::CatchMaybeTests() {
// Don't add additional code to this method. Instead add it to
// Initialize(). See bug 6436.
int TestSuite::Run() {
- base::ScopedNSAutoreleasePool scoped_pool;
+ base::mac::ScopedNSAutoreleasePool scoped_pool;
Initialize();
std::string client_func =