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

chrome/browser/ui/cocoa/view_id_util_browsertest.mm

 // Copyright (c) 2012 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.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window_testing.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ skipping 19 matching lines @@
     ASSERT_TRUE(root_window_);
     NSView* view = view_id_util::GetView(root_window_, view_id);
     EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id;
   }
 
   void DoTest() {
     // Make sure FindBar is created to test VIEW_ID_FIND_IN_PAGE_TEXT_FIELD.
     chrome::ShowFindBar(browser());
 
     // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED
-    DevToolsWindow::OpenDevToolsWindowForTest(browser(), true);
+    DevToolsWindow* devtools_window =
+        DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true);
 
     // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF
     browser()->window()->GetDownloadShelf()->Show();
 
     // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT
     BookmarkModel* bookmark_model =
         BookmarkModelFactory::GetForProfile(browser()->profile());
     if (bookmark_model) {
       if (!bookmark_model->loaded())
         test::WaitForBookmarkModelToLoad(bookmark_model);
@@ skipping 14 matching lines @@
           i == VIEW_ID_TRANSLATE_BUTTON) {
         continue;
       }
 
       CheckViewID(static_cast<ViewID>(i), true);
     }
 
     CheckViewID(VIEW_ID_TAB, true);
     CheckViewID(VIEW_ID_TAB_STRIP, true);
     CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
+
+    DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
   }
 
  private:
   NSWindow* root_window_;
 };
 
 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) {
   ASSERT_NO_FATAL_FAILURE(DoTest());
 }
 
@@ skipping 22 matching lines @@
   }
 
   // Open the 11th tab.
   browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL),
                                    Referrer(),
                                    NEW_BACKGROUND_TAB,
                                    content::PAGE_TRANSITION_TYPED,
                                    false));
   CheckViewID(VIEW_ID_TAB_LAST, true);
 }