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

Unified Diff: ios/web/web_state/js/crw_js_early_script_manager_unittest.mm

Issue 1171203004: Correct iOS build for latest Xcode beta. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UNAVAILABLE_ATTRIBUTE->NS_UNAVAILABLE Created 5 years, 6 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/web_state/js/crw_js_early_script_manager_unittest.mm
diff --git a/ios/web/web_state/js/crw_js_early_script_manager_unittest.mm b/ios/web/web_state/js/crw_js_early_script_manager_unittest.mm
index f0f2bfb2ab78d5118b48bf4f06070e167a3a12db..ff163b2ab7b4d5fb90fc77afa254642a418024a6 100644
--- a/ios/web/web_state/js/crw_js_early_script_manager_unittest.mm
+++ b/ios/web/web_state/js/crw_js_early_script_manager_unittest.mm
@@ -43,7 +43,12 @@ TEST_F(CRWJSEarlyScriptManagerTest, Content) {
// |earlyScript| is a substring of |injectionContent|. The latter wraps the
// former with "if (typeof __gCrWeb !== 'object')" check to avoid multiple
// injections.
- EXPECT_NE(NSNotFound, [injectionContent rangeOfString:earlyScript].location);
+ // TODO(justincohen): Cast indexOfObject to work around Xcode beta bugs.
+ // Revisit in future betas where hopefully these types match again.
+ // crbug.com/498825
+ EXPECT_NE(NSNotFound,
+ static_cast<NSInteger>(
+ [injectionContent rangeOfString:earlyScript].location));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698