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 /webkit | |
| 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 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/run_all_tests.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc index 09c75bb..a8857ff 100644 --- a/webkit/tools/test_shell/run_all_tests.cc +++ b/webkit/tools/test_shell/run_all_tests.cc @@ -15,13 +15,9 @@ #include "base/at_exit.h" #include "base/command_line.h" #include "base/i18n/icu_util.h" -#if defined(OS_MACOSX) -#include "base/mac_util.h" -#include "base/path_service.h" -#endif +#include "base/mac/scoped_nsautorelease_pool.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "base/scoped_nsautorelease_pool.h" #include "webkit/glue/webkit_glue.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_shell.h" @@ -31,6 +27,11 @@ #include "webkit/tools/test_shell/test_shell_webkit_init.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_MACOSX) +#include "base/mac_util.h" +#include "base/path_service.h" +#endif + const char* const TestShellTest::kJavascriptDelayExitScript = "<script>" "window.layoutTestController.waitUntilDone();" @@ -41,7 +42,7 @@ const char* const TestShellTest::kJavascriptDelayExitScript = "</script>"; int main(int argc, char* argv[]) { - base::ScopedNSAutoreleasePool autorelease_pool; + base::mac::ScopedNSAutoreleasePool autorelease_pool; base::EnableInProcessStackDumping(); base::EnableTerminationOnHeapCorruption(); // Some unittests may use base::Singleton<>, thus we need to instanciate |