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

Unified Diff: ios/web/public/test/earl_grey/web_view_matchers.mm

Issue 2886573002: [ObjC ARC] Converts ios/web:earl_grey_test_support to ARC. (Closed)
Patch Set: autoreleasing Created 3 years, 7 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/web/public/test/earl_grey/web_view_matchers.mm
diff --git a/ios/web/public/test/earl_grey/web_view_matchers.mm b/ios/web/public/test/earl_grey/web_view_matchers.mm
index aa45475ed457dd62978bbfe0d45ffa1826dbf27f..c2757a863b6ff3968175775179ad953587995921 100644
--- a/ios/web/public/test/earl_grey/web_view_matchers.mm
+++ b/ios/web/public/test/earl_grey/web_view_matchers.mm
@@ -8,7 +8,6 @@
#import <WebKit/WebKit.h>
#import "base/mac/bind_objc_block.h"
-#import "base/mac/scoped_nsobject.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -20,6 +19,10 @@
#import "ios/web/public/test/web_view_interaction_test_util.h"
#import "net/base/mac/url_conversions.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
using testing::kWaitForDownloadTimeout;
using testing::WaitUntilConditionOrTimeout;
@@ -59,8 +62,8 @@ char kTestCssSelectorJavaScriptTemplate[] = "!!document.querySelector(\"%s\");";
// Fetches the image from |image_url|.
UIImage* LoadImage(const GURL& image_url) {
- __block base::scoped_nsobject<UIImage> image;
- __block base::scoped_nsobject<NSError> error;
+ __block UIImage* image;
+ __block NSError* error;
TestURLSessionDelegate* session_delegate =
[[TestURLSessionDelegate alloc] init];
NSURLSessionConfiguration* session_config =
@@ -71,11 +74,10 @@ UIImage* LoadImage(const GURL& image_url) {
delegateQueue:nil];
id completion_handler = ^(NSData* data, NSURLResponse*, NSError* task_error) {
if (task_error) {
Eugene But (OOO till 7-30) 2017/05/16 22:39:37 Do we even need this if-else? Should we simply ass
baxley 2017/06/02 15:39:38 Done.
- error.reset([task_error retain]);
+ error = task_error;
} else {
- image.reset([[UIImage alloc] initWithData:data]);
+ image = [[UIImage alloc] initWithData:data];
}
- [session_delegate autorelease];
};
NSURLSessionDataTask* task =
@@ -88,7 +90,7 @@ UIImage* LoadImage(const GURL& image_url) {
});
GREYAssert(image_loaded, @"Failed to download image");
- return [[image retain] autorelease];
+ return image;
}
// Helper function for matching web views containing or not containing |text|,
@@ -115,11 +117,11 @@ id<GREYMatcher> WebViewWithText(std::string text,
[description appendText:base::SysUTF8ToNSString(text)];
};
- return grey_allOf(WebViewInWebState(web_state),
- [[[GREYElementMatcherBlock alloc]
- initWithMatchesBlock:matches
- descriptionBlock:describe] autorelease],
- nil);
+ return grey_allOf(
+ WebViewInWebState(web_state),
+ [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe],
+ nil);
}
// Matcher for WKWebView containing loaded or blocked image with |image_id|.
@@ -191,11 +193,11 @@ id<GREYMatcher> WebViewContainingImage(std::string image_id,
[description appendText:base::SysUTF8ToNSString(image_id)];
};
- return grey_allOf(WebViewInWebState(web_state),
- [[[GREYElementMatcherBlock alloc]
- initWithMatchesBlock:matches
- descriptionBlock:describe] autorelease],
- nil);
+ return grey_allOf(
+ WebViewInWebState(web_state),
+ [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe],
+ nil);
}
} // namespace
@@ -212,9 +214,8 @@ id<GREYMatcher> WebViewInWebState(WebState* web_state) {
[description appendText:@"web view in web state"];
};
- return [[[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
- descriptionBlock:describe]
- autorelease];
+ return [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe];
}
id<GREYMatcher> WebViewContainingText(std::string text, WebState* web_state) {
@@ -256,11 +257,11 @@ id<GREYMatcher> WebViewCssSelector(std::string selector, WebState* web_state) {
[description appendText:base::SysUTF8ToNSString(selector)];
};
- return grey_allOf(WebViewInWebState(web_state),
- [[[GREYElementMatcherBlock alloc]
- initWithMatchesBlock:matches
- descriptionBlock:describe] autorelease],
- nil);
+ return grey_allOf(
+ WebViewInWebState(web_state),
+ [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe],
+ nil);
}
id<GREYMatcher> WebViewScrollView(WebState* web_state) {
@@ -274,9 +275,8 @@ id<GREYMatcher> WebViewScrollView(WebState* web_state) {
[description appendText:@"web view scroll view"];
};
- return [[[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
- descriptionBlock:describe]
- autorelease];
+ return [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe];
}
id<GREYMatcher> Interstitial(WebState* web_state) {
@@ -291,11 +291,11 @@ id<GREYMatcher> Interstitial(WebState* web_state) {
[description appendText:@"interstitial displayed"];
};
- return grey_allOf(WebViewInWebState(web_state),
- [[[GREYElementMatcherBlock alloc]
- initWithMatchesBlock:matches
- descriptionBlock:describe] autorelease],
- nil);
+ return grey_allOf(
+ WebViewInWebState(web_state),
+ [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe],
+ nil);
}
id<GREYMatcher> InterstitialContainingText(NSString* text,
@@ -313,11 +313,11 @@ id<GREYMatcher> InterstitialContainingText(NSString* text,
[description appendText:text];
};
- return grey_allOf(Interstitial(web_state),
- [[[GREYElementMatcherBlock alloc]
- initWithMatchesBlock:matches
- descriptionBlock:describe] autorelease],
- nil);
+ return grey_allOf(
+ Interstitial(web_state),
+ [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
+ descriptionBlock:describe],
+ nil);
}
} // namespace web

Powered by Google App Engine
This is Rietveld 408576698