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

Unified Diff: ios/chrome/browser/find_in_page/find_in_page_js_unittest.mm

Issue 2941053002: [ObjC ARC] Converts ios/chrome/browser/find_in_page:unit_tests_nonarc to ARC. (Closed)
Patch Set: Consolidated build.gn Created 3 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/chrome/browser/find_in_page/find_in_page_js_unittest.mm
diff --git a/ios/chrome/browser/find_in_page/find_in_page_js_unittest.mm b/ios/chrome/browser/find_in_page/find_in_page_js_unittest.mm
index 06398da8b42226270703dae198baf3510055345a..fc9a9f41a257bd0a531182b78dcdc75272a845fb 100644
--- a/ios/chrome/browser/find_in_page/find_in_page_js_unittest.mm
+++ b/ios/chrome/browser/find_in_page/find_in_page_js_unittest.mm
@@ -5,7 +5,6 @@
#import <UIKit/UIKit.h>
#include "base/mac/foundation_util.h"
-#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#import "ios/chrome/browser/find_in_page/find_in_page_model.h"
#import "ios/chrome/browser/find_in_page/js_findinpage_manager.h"
@@ -16,6 +15,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gtest_mac.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
// Unit tests for the find_in_page.js JavaScript file.
namespace {
@@ -101,15 +104,15 @@ class FindInPageJsTest : public ChromeWebTest {
void SetUp() override {
ChromeWebTest::SetUp();
- findInPageModel_.reset([[FindInPageModel alloc] init]);
- findInPageJsManager_.reset([base::mac::ObjCCastStrict<JsFindinpageManager>(
+ findInPageModel_ = [[FindInPageModel alloc] init];
+ findInPageJsManager_ = base::mac::ObjCCastStrict<JsFindinpageManager>(
[web_state()->GetJSInjectionReceiver()
- instanceOfClass:[JsFindinpageManager class]]) retain]);
- findInPageJsManager_.get().findInPageModel = findInPageModel_;
+ instanceOfClass:[JsFindinpageManager class]]);
+ findInPageJsManager_.findInPageModel = findInPageModel_;
}
- base::scoped_nsobject<FindInPageModel> findInPageModel_;
- base::scoped_nsobject<JsFindinpageManager> findInPageJsManager_;
+ FindInPageModel* findInPageModel_;
+ JsFindinpageManager* findInPageJsManager_;
};
// Performs a search, then calls |incrementIndex| to loop through the
« no previous file with comments | « ios/chrome/browser/find_in_page/BUILD.gn ('k') | ios/chrome/browser/find_in_page/js_findinpage_manager_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698