| Index: ios/chrome/app/safe_mode/safe_mode_egtest.mm
|
| diff --git a/ios/chrome/app/safe_mode/safe_mode_egtest.mm b/ios/chrome/app/safe_mode/safe_mode_egtest.mm
|
| index 59626935de1699ddc27e86cb3d429781337ddc2b..fcefeadbc8c405403e820a98177171c5e46e8713 100644
|
| --- a/ios/chrome/app/safe_mode/safe_mode_egtest.mm
|
| +++ b/ios/chrome/app/safe_mode/safe_mode_egtest.mm
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/mac/foundation_util.h"
|
| -#include "base/mac/scoped_nsobject.h"
|
| #import "ios/chrome/app/chrome_overlay_window.h"
|
| #import "ios/chrome/app/safe_mode/safe_mode_view_controller.h"
|
| #import "ios/chrome/browser/ui/main/main_view_controller.h"
|
| @@ -15,6 +14,10 @@
|
| #import "ios/chrome/test/base/scoped_block_swizzler.h"
|
| #import "ios/chrome/test/earl_grey/chrome_test_case.h"
|
|
|
| +#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| +#error "This file requires ARC support."
|
| +#endif
|
| +
|
| namespace {
|
|
|
| // Returns the top view controller for rendering the Safe Mode Controller.
|
| @@ -80,8 +83,8 @@ void AssertTryAgainButtonOnPage() {
|
| });
|
|
|
| // Instantiates a Safe Mode controller and displays it.
|
| - base::scoped_nsobject<SafeModeViewController> safeModeController(
|
| - [[SafeModeViewController alloc] initWithDelegate:nil]);
|
| + SafeModeViewController* safeModeController =
|
| + [[SafeModeViewController alloc] initWithDelegate:nil];
|
| [GetActiveViewController() presentViewController:safeModeController
|
| animated:NO
|
| completion:nil];
|
| @@ -110,8 +113,8 @@ void AssertTryAgainButtonOnPage() {
|
| });
|
|
|
| // Instantiates a Safe Mode controller and displays it.
|
| - base::scoped_nsobject<SafeModeViewController> safeModeController(
|
| - [[SafeModeViewController alloc] initWithDelegate:nil]);
|
| + SafeModeViewController* safeModeController =
|
| + [[SafeModeViewController alloc] initWithDelegate:nil];
|
| [GetActiveViewController() presentViewController:safeModeController
|
| animated:NO
|
| completion:nil];
|
| @@ -146,8 +149,8 @@ void AssertTryAgainButtonOnPage() {
|
| return YES;
|
| });
|
| // Instantiates a Safe Mode controller and displays it.
|
| - base::scoped_nsobject<SafeModeViewController> safeModeController(
|
| - [[SafeModeViewController alloc] initWithDelegate:nil]);
|
| + SafeModeViewController* safeModeController =
|
| + [[SafeModeViewController alloc] initWithDelegate:nil];
|
| [GetActiveViewController() presentViewController:safeModeController
|
| animated:NO
|
| completion:nil];
|
|
|