Chromium Code Reviews| Index: chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_browsertest.h |
| diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_browsertest.h |
| similarity index 77% |
| rename from chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h |
| rename to chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_browsertest.h |
| index 093f28b3e3a94aad19bc38f34bcf027c4504a6ed..c954c6ebfdc19704ded83df4a05b54b63240240c 100644 |
| --- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h |
| +++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_browsertest.h |
| @@ -2,8 +2,8 @@ |
| // 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_APPLESCRIPT_BOOKMARK_APPLESCRIPT_UTILS_UNITTEST_H_ |
| -#define CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BOOKMARK_APPLESCRIPT_UTILS_UNITTEST_H_ |
| +#ifndef CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BOOKMARK_APPLESCRIPT_UTILS_BROWSERTEST_H_ |
| +#define CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BOOKMARK_APPLESCRIPT_UTILS_BROWSERTEST_H_ |
| #import <Cocoa/Cocoa.h> |
| #import <objc/objc-runtime.h> |
| @@ -11,15 +11,17 @@ |
| #include "base/mac/scoped_nsobject.h" |
| #import "chrome/browser/app_controller_mac.h" |
| #import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" |
| -#include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" |
| +#include "chrome/test/base/in_process_browser_test.h" |
| #include "testing/platform_test.h" |
| +class BookmarkAppleScriptTest; |
| + |
| // The fake object that acts as our app's delegate, useful for testing purposes. |
| @interface FakeAppDelegate : AppController { |
|
tapted
2017/03/02 23:17:17
Does anything alloc this any more? (can we just re
snake
2017/03/06 12:53:34
Done.
|
| @public |
| - CocoaProfileTest* test_; // weak. |
| + BookmarkAppleScriptTest* test_; // weak. |
| } |
| -@property(nonatomic) CocoaProfileTest* test; |
| +@property(nonatomic) BookmarkAppleScriptTest* test; |
| // Return the |TestingProfile*| which is used for testing. |
| - (Profile*)lastProfile; |
| @end |
| @@ -34,11 +36,13 @@ |
| // The base class for all our bookmark releated unit tests. |
| -class BookmarkAppleScriptTest : public CocoaProfileTest { |
| +class BookmarkAppleScriptTest : public InProcessBrowserTest { |
| public: |
| BookmarkAppleScriptTest(); |
| ~BookmarkAppleScriptTest() override; |
| - void SetUp() override; |
| + void SetUpOnMainThread() override; |
| + |
| + Profile* profile() const; |
| private: |
| base::scoped_nsobject<FakeAppDelegate> appDelegate_; |
| @@ -47,4 +51,4 @@ class BookmarkAppleScriptTest : public CocoaProfileTest { |
| base::scoped_nsobject<BookmarkFolderAppleScript> bookmarkBar_; |
| }; |
| -#endif // CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BOOKMARK_APPLESCRIPT_UTILS_UNITTEST_H_ |
| +#endif // CHROME_BROWSER_UI_COCOA_APPLESCRIPT_BOOKMARK_APPLESCRIPT_UTILS_BROWSERTEST_H_ |