Convert a bunch of test_shell_tests to content_browsertests. These are tests that depend on loading…

webkit/tools/test_shell/run_all_tests.cc

Index: webkit/tools/test_shell/run_all_tests.cc
===================================================================
--- webkit/tools/test_shell/run_all_tests.cc	(revision 195684)
+++ webkit/tools/test_shell/run_all_tests.cc	(working copy)
@@ -2,106 +2,8 @@
 // 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().
+// TODO(jam): remove this target when all the bots are updated.
 
-#include "base/basictypes.h"
-
-#if defined(OS_WIN)
-#include <windows.h>
-#include <commctrl.h>
-#endif
-
-#include "base/command_line.h"
-#include "base/message_loop.h"
-#include "base/process_util.h"
-#include "base/test/test_suite.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/bundle_locations.h"
-#include "base/mac/mac_util.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/path_service.h"
-#endif
-
-class TestShellTestSuite : public base::TestSuite {
- public:
-  TestShellTestSuite(int argc, char** argv)
-      : base::TestSuite(argc, argv),
-        platform_delegate_(*CommandLine::ForCurrentProcess()),
-        test_shell_webkit_init_(true) {
-  }
-
-  virtual void Initialize() OVERRIDE {
-    // Override DIR_EXE early in case anything in base::TestSuite uses it.
-#if defined(OS_MACOSX)
-    base::FilePath path;
-    PathService::Get(base::DIR_EXE, &path);
-    path = path.AppendASCII("TestShell.app");
-    base::mac::SetOverrideFrameworkBundlePath(path);
-#endif
-
-    base::TestSuite::Initialize();
-
-    const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
-
-    // Allow tests to analyze GC information from V8 log, and expose GC
-    // triggering function.
-    std::string js_flags =
-        parsed_command_line.GetSwitchValueASCII(test_shell::kJavaScriptFlags);
-    js_flags += " --expose_gc";
-    webkit_glue::SetJavaScriptFlags(js_flags);
-
-    // Suppress error dialogs and do not show GP fault error box on Windows.
-    TestShell::InitLogging(true, false, false);
-
-    // Some of the individual tests wind up calling TestShell::WaitTestFinished
-    // which has a timeout in it.  For these tests, we don't care about
-    // a timeout so just set it to be really large.  This is necessary because
-    // we hit those timeouts under Valgrind.
-    TestShell::SetFileTestTimeout(10 * 60 * 60 * 1000);  // Ten hours.
-
-    // Initialize test shell in layout test mode, which will let us load one
-    // request than automatically quit.
-    TestShell::InitializeTestShell(true, false);
-
-    platform_delegate_.InitializeGUI();
-    platform_delegate_.SelectUnifiedTheme();
-  }
-
-  virtual void Shutdown() OVERRIDE {
-    TestShell::ShutdownTestShell();
-    TestShell::CleanupLogging();
-
-    base::TestSuite::Shutdown();
-  }
-
- private:
-  TestShellPlatformDelegate platform_delegate_;
-
-  // Allocate a message loop for this thread.  Although it is not used
-  // directly, its constructor sets up some necessary state.
-  MessageLoopForUI main_message_loop_;
-
-  // Initialize WebKit for this scope.
-  TestShellWebKitInit test_shell_webkit_init_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestShellTestSuite);
-};
-
 int main(int argc, char** argv) {
-#if defined(OS_MACOSX)
-  base::mac::ScopedNSAutoreleasePool scoped_pool;
-#endif
-
-  TestShellPlatformDelegate::PreflightArgs(&argc, &argv);
-  return TestShellTestSuite(argc, argv).Run();
+  return 0;
 }