| Index: chrome/browser/ui/cocoa/cocoa_profile_test.h
|
| diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.h b/chrome/browser/ui/cocoa/cocoa_profile_test.h
|
| index 5c50c7c1af8f7063049ec20181e74dc833c20532..7fe4a7d28116b0374ba3708ccd0bf7bc7a1c7a5a 100644
|
| --- a/chrome/browser/ui/cocoa/cocoa_profile_test.h
|
| +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.h
|
| @@ -8,11 +8,11 @@
|
|
|
| #include "base/memory/scoped_ptr.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"
|
| -#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
|
| -#include "content/browser/browser_thread.h"
|
| +#include "content/test/test_browser_thread.h"
|
|
|
| // Base class which contains a valid Browser*. Lots of boilerplate to
|
| // recycle between unit test classes.
|
| @@ -58,14 +58,14 @@ class CocoaProfileTest : public CocoaTest {
|
|
|
| private:
|
| MessageLoopForUI message_loop_;
|
| - BrowserThread ui_thread_;
|
| + content::TestBrowserThread ui_thread_;
|
|
|
| TestingProfileManager profile_manager_;
|
| TestingProfile* profile_; // Weak; owned by profile_manager_.
|
| scoped_ptr<Browser> browser_;
|
|
|
| - scoped_ptr<BrowserThread> file_thread_;
|
| - scoped_ptr<BrowserThread> io_thread_;
|
| + scoped_ptr<content::TestBrowserThread> file_thread_;
|
| + scoped_ptr<content::TestBrowserThread> io_thread_;
|
| };
|
|
|
| #endif // CHROME_BROWSER_UI_COCOA_PROFILE_TEST_H_
|
|
|