Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: ios/chrome/browser/ui/settings/block_popups_egtest.mm

Issue 2796043002: [ObjC ARC] Converts ios/chrome/browser/ui/settings:eg_tests to ARC. (Closed)
Patch Set: s/unsafe/weak Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/settings/block_popups_egtest.mm
diff --git a/ios/chrome/browser/ui/settings/block_popups_egtest.mm b/ios/chrome/browser/ui/settings/block_popups_egtest.mm
index 9fafff9fd49f21afb77b2a00f99a4edcc583bfbd..57a113b4152acd5333ef5833579a4b921ac2895c 100644
--- a/ios/chrome/browser/ui/settings/block_popups_egtest.mm
+++ b/ios/chrome/browser/ui/settings/block_popups_egtest.mm
@@ -31,6 +31,10 @@
#include "ui/base/l10n/l10n_util_mac.h"
#include "url/gurl.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
using chrome_test_util::NavigationBarDoneButton;
namespace {
@@ -204,7 +208,7 @@ class ScopedBlockPopupsException {
chrome_test_util::AssertMainTabCount(1U);
// Request popup and make sure the popup opened in a new tab.
- NSError* error = nil;
+ __unsafe_unretained NSError* error = nil;
chrome_test_util::ExecuteJavaScript(kOpenPopupScript, &error);
GREYAssert(!error, @"Error during script execution: %@", error);
chrome_test_util::AssertMainTabCount(2U);
@@ -236,7 +240,7 @@ class ScopedBlockPopupsException {
// Request popup, then make sure it was blocked and an infobar was displayed.
// The window.open() call is run via async JS, so the infobar may not open
// immediately.
- NSError* error = nil;
+ __unsafe_unretained NSError* error = nil;
chrome_test_util::ExecuteJavaScript(kOpenPopupScript, &error);
GREYAssert(!error, @"Error during script execution: %@", error);

Powered by Google App Engine
This is Rietveld 408576698