Revert 50726 "DevTools: Migrate to new WebView initialization (pass devtools client directly)."

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 74 matching lines @@
     TestShell();
     virtual ~TestShell();
 
     // Initialization and clean up of logging.
     static void InitLogging(bool suppress_error_dialogs,
                             bool running_layout_tests,
                             bool enable_gp_fault_error_box);
     static void CleanupLogging();
 
     // Initialization and clean up of a static member variable.
-    static void InitializeTestShell(bool layout_test_mode,
+    static void InitializeTestShell(bool layout_test_mode, 
                                     bool allow_external_pages);
     static void ShutdownTestShell();
 
     static bool layout_test_mode() { return layout_test_mode_; }
     static bool allow_external_pages() { return allow_external_pages_; }
 
     // Called from the destructor to let each platform do any necessary
     // cleanup.
     void PlatformCleanUp();
 
@@ skipping 216 matching lines @@
 
     TestShellDevToolsAgent* dev_tools_agent() {
       return dev_tools_agent_.get();
     }
 
     static void disable_html5_parser() { enable_html5_parser_ = false; }
 
 protected:
     void CreateDevToolsClient(TestShellDevToolsAgent* agent);
     bool Initialize(const GURL& starting_url);
+    void InitializeDevToolsAgent(WebKit::WebView* webView);
     bool IsSVGTestURL(const GURL& url);
     void SizeToSVG();
     void SizeToDefault();
     void SizeTo(int width, int height);
     void ResizeSubViews();
 
     // Set the focus in interactive mode (pass through to relevant system call).
     void InteractiveSetFocus(WebWidgetHost* host, bool enable);
 
     enum UIControl {
@@ skipping 36 matching lines @@
 #endif
 
     // True if developer extras should be enabled.
     static bool developer_extras_enabled_;
 
     // Whether DevTools should be open before loading the page.
     static bool inspector_test_mode_;
 
     // True when the app is being run using the --layout-tests switch.
     static bool layout_test_mode_;
-
+  
     // True when we wish to allow test shell to load external pages like
-    // www.google.com even when in --layout-test mode (used for QA to
+    // www.google.com even when in --layout-test mode (used for QA to 
     // produce images of the rendered page)
     static bool allow_external_pages_;
 
     // Whether to use the new HTML5 parsing code.
     static bool enable_html5_parser_;
 
     // Default timeout in ms for file page loads when in layout test mode.
     static int file_test_timeout_ms_;
 
     scoped_ptr<AccessibilityController> accessibility_controller_;
@@ skipping 35 matching lines @@
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_