| Index: chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_test.h
|
| diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_test.h
|
| similarity index 58%
|
| rename from chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
|
| rename to chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_test.h
|
| index 093f28b3e3a94aad19bc38f34bcf027c4504a6ed..52c7d539bbad31f02ddb54c4a7df98cd8110b652 100644
|
| --- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
|
| +++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_test.h
|
| @@ -2,28 +2,15 @@
|
| // 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>
|
|
|
| #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 "testing/platform_test.h"
|
| -
|
| -// The fake object that acts as our app's delegate, useful for testing purposes.
|
| -@interface FakeAppDelegate : AppController {
|
| - @public
|
| - CocoaProfileTest* test_; // weak.
|
| -}
|
| -@property(nonatomic) CocoaProfileTest* test;
|
| -// Return the |TestingProfile*| which is used for testing.
|
| -- (Profile*)lastProfile;
|
| -@end
|
| -
|
| +#include "chrome/test/base/in_process_browser_test.h"
|
|
|
| // Used to emulate an active running script, useful for testing purposes.
|
| @interface FakeScriptCommand : NSScriptCommand {
|
| @@ -34,17 +21,16 @@
|
|
|
|
|
| // 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;
|
|
|
| - private:
|
| - base::scoped_nsobject<FakeAppDelegate> appDelegate_;
|
| + Profile* profile() const;
|
|
|
| protected:
|
| 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_
|
|
|