Cleanup and IWYU-ify CocoaProfileTest and related tests.

chrome/browser/ui/cocoa/cocoa_profile_test.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
 #define CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
-#include "content/public/test/test_browser_thread.h"
+
+namespace content {
+class TestBrowserThreadBundle;
+}
+
+class Browser;
+class TestingProfile;
 
 // Base class which contains a valid Browser*.  Lots of boilerplate to
 // recycle between unit test classes.
 //
 // This class creates fake UI, file, and IO threads because many objects that
 // are attached to the TestingProfile (and other objects) have traits that limit
 // their destruction to certain threads. For example, the net::URLRequestContext
 // can only be deleted on the IO thread; without this fake IO thread, the object
 // would never be deleted and would report as a leak under Valgrind. Note that
 // these are fake threads and they all share the same MessageLoop.
@@ skipping 24 matching lines @@
   // Closes the window for this browser. This will automatically be called as
   // part of TearDown() if it's not been done already.
   void CloseBrowserWindow();
 
  protected:
   // Overridden by test subclasses to create their own browser, e.g. with a
   // test window.
   virtual Browser* CreateBrowser();
 
  private:
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-
   TestingProfileManager profile_manager_;
   TestingProfile* profile_;  // Weak; owned by profile_manager_.
   scoped_ptr<Browser> browser_;
 
-  scoped_ptr<content::TestBrowserThread> file_user_blocking_thread_;
-  scoped_ptr<content::TestBrowserThread> file_thread_;
-  scoped_ptr<content::TestBrowserThread> io_thread_;
+  scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_