Revert of [DevTools] Move DevToolsWindow testing code to a separate class.

chrome/browser/devtools/devtools_window.h

Index: chrome/browser/devtools/devtools_window.h
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index 5cf23b164553635aedf69580b720958c989b7da6..2bfa5f02bfec32b8be22491cf51db5d4b1ff6279 100644
--- a/chrome/browser/devtools/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -13,7 +13,6 @@
 
 class Browser;
 class BrowserWindow;
-class DevToolsWindowTesting;
 class DevToolsEventForwarder;
 
 namespace content {
@@ -72,6 +71,11 @@
   static DevToolsWindow* OpenDevToolsWindow(
       content::RenderViewHost* inspected_rvh);
 
+  static DevToolsWindow* OpenDevToolsWindowForTest(
+      content::RenderViewHost* inspected_rvh, bool is_docked);
+  static DevToolsWindow* OpenDevToolsWindowForTest(
+      Browser* browser, bool is_docked);
+
   // Perform specified action for current WebContents inside a |browser|.
   // This may close currently open DevTools window.
   static DevToolsWindow* ToggleDevToolsWindow(
@@ -91,6 +95,9 @@
 
   static void InspectElement(
       content::RenderViewHost* inspected_rvh, int x, int y);
+
+  Browser* browser_for_test() { return browser_; }
+  content::WebContents* web_contents_for_test() { return main_web_contents_; }
 
   // Sets closure to be called after load is done. If already loaded, calls
   // closure immediately.
@@ -174,7 +181,8 @@
   static void OnPageCloseCanceled(content::WebContents* contents);
 
  private:
-  friend class DevToolsWindowTesting;
+  friend class DevToolsSanityTest;
+  friend class BrowserWindowControllerTest;
 
   // DevTools lifecycle typically follows this way:
   // - Toggle/Open: client call;
@@ -207,22 +215,19 @@
                                 content::RenderViewHost* inspected_rvh,
                                 bool shared_worker_frontend,
                                 bool external_frontend,
-                                bool can_dock,
-                                const std::string& settings);
+                                bool can_dock);
   static GURL GetDevToolsURL(Profile* profile,
                              const GURL& base_url,
                              bool shared_worker_frontend,
                              bool external_frontend,
-                             bool can_dock,
-                             const std::string& settings);
+                             bool can_dock);
   static DevToolsWindow* FindDevToolsWindow(content::DevToolsAgentHost*);
   static DevToolsWindow* AsDevToolsWindow(content::WebContents*);
   static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile);
   static DevToolsWindow* ToggleDevToolsWindow(
       content::RenderViewHost* inspected_rvh,
       bool force_open,
-      const DevToolsToggleAction& action,
-      const std::string& settings);
+      const DevToolsToggleAction& action);
 
   static std::string GetDevToolsWindowPlacementPrefKey();
 
@@ -290,6 +295,7 @@
   void Show(const DevToolsToggleAction& action);
   void DoAction(const DevToolsToggleAction& action);
   void LoadCompleted();
+  void SetIsDockedAndShowImmediatelyForTest(bool is_docked);
   void UpdateBrowserToolbar();
   void UpdateBrowserWindow();
   content::WebContents* GetInspectedWebContents();
@@ -305,12 +311,12 @@
   const bool can_dock_;
   LifeStage life_stage_;
   DevToolsToggleAction action_on_load_;
+  bool ignore_set_is_docked_;
   DevToolsContentsResizingStrategy contents_resizing_strategy_;
   // True if we're in the process of handling a beforeunload event originating
   // from the inspected webcontents, see InterceptPageBeforeUnload for details.
   bool intercepted_page_beforeunload_;
   base::Closure load_completed_callback_;
-  base::Closure close_callback_;
 
   base::TimeTicks inspect_element_start_time_;
   scoped_ptr<DevToolsEventForwarder> event_forwarder_;