Move scoped_nsdisable_screen_update from base to app/mac...

webkit/tools/test_shell/run_all_tests.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Run all of our test shell tests.  This is just an entry point
 // to kick off gTest's RUN_ALL_TESTS().
 
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #endif
 
 #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"
 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
 #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();"
     "window.addEventListener('load', function() {"
     "  var x = document.body.clientWidth;"  // Force a document layout
     "  window.layoutTestController.notifyDone();"
     "});"
   "</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
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;
 
 #if defined(OS_MACOSX)
   FilePath path;
   PathService::Get(base::DIR_EXE, &path);
   path = path.AppendASCII("TestShell.app");
@@ skipping 42 matching lines @@
   testing::InitGoogleTest(&argc, argv);
   int result = RUN_ALL_TESTS();
 
   TestShell::ShutdownTestShell();
   TestShell::CleanupLogging();
 
   CommandLine::Reset();
 
   return result;
 }