Index: ios/chrome/browser/ui/contextual_search/contextual_search_js_unittest.mm |
diff --git a/ios/chrome/browser/ui/contextual_search/contextual_search_js_unittest.mm b/ios/chrome/browser/ui/contextual_search/contextual_search_js_unittest.mm |
index d22021e568cf1a9995e0deea72166884a2d58a78..52f3d5169923bb8ab2e7a4590eae09c52f8a860e 100644 |
--- a/ios/chrome/browser/ui/contextual_search/contextual_search_js_unittest.mm |
+++ b/ios/chrome/browser/ui/contextual_search/contextual_search_js_unittest.mm |
@@ -8,7 +8,6 @@ |
#include "base/ios/ios_util.h" |
#include "base/json/json_reader.h" |
-#include "base/mac/scoped_nsobject.h" |
#include "base/strings/sys_string_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
#import "base/test/ios/wait_util.h" |
@@ -27,6 +26,10 @@ |
#include "testing/gtest_mac.h" |
#import "third_party/ocmock/OCMock/OCMock.h" |
+#if !defined(__has_feature) || !__has_feature(objc_arc) |
+#error "This file requires ARC support." |
+#endif |
+ |
// Unit tests for the resources/contextualsearch.js JavaScript file. |
struct ContextualSearchStruct { |
@@ -223,17 +226,16 @@ class ContextualSearchJsTest : public ChromeWebTest { |
void SetUp() override { |
ChromeWebTest::SetUp(); |
- mockDelegate_.reset([[OCMockObject |
- niceMockForProtocol:@protocol(ContextualSearchControllerDelegate)] |
- retain]); |
+ mockDelegate_ = [OCMockObject |
+ niceMockForProtocol:@protocol(ContextualSearchControllerDelegate)]; |
jsUnittestsAdditions_ = static_cast<JsContextualSearchAdditionsManager*>( |
[web_state()->GetJSInjectionReceiver() |
instanceOfClass:[JsContextualSearchAdditionsManager class]]); |
TestChromeBrowserState::Builder test_cbs_builder; |
chrome_browser_state_ = test_cbs_builder.Build(); |
- controller_.reset([[ContextualSearchController alloc] |
+ controller_ = [[ContextualSearchController alloc] |
initWithBrowserState:chrome_browser_state_.get() |
- delegate:mockDelegate_]); |
+ delegate:mockDelegate_]; |
[controller_ |
setPermissions:[[MockTouchToSearchPermissionsMediator alloc] |
initWithBrowserState:chrome_browser_state_.get()]]; |
@@ -245,15 +247,15 @@ class ContextualSearchJsTest : public ChromeWebTest { |
[controller_ close]; |
// Need to tear down the controller so it deregisters its JS handlers |
// before |webController_| is destroyed. |
- controller_.reset(); |
+ controller_ = nil; |
ChromeWebTest::TearDown(); |
} |
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_; |
__unsafe_unretained JsContextualSearchAdditionsManager* jsUnittestsAdditions_; |
- base::scoped_nsobject<ContextualSearchController> controller_; |
- base::scoped_nsobject<id> mockDelegate_; |
- base::scoped_nsobject<id> mockToolbarDelegate_; |
+ ContextualSearchController* controller_; |
+ id mockDelegate_; |
+ id mockToolbarDelegate_; |
}; |
// Test that ignored elements do not trigger CS when tapped. |