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

Unified Diff: ios/web/web_state/web_state_observer_bridge_unittest.mm

Issue 2935933003: [ObjC ARC] Converts ios/web:ios_web_web_state_unittests to ARC. (Closed)
Patch Set: Review fixes. 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
« no previous file with comments | « ios/web/web_state/web_state_impl_unittest.mm ('k') | ios/web/web_state/web_state_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/web_state_observer_bridge_unittest.mm
diff --git a/ios/web/web_state/web_state_observer_bridge_unittest.mm b/ios/web/web_state/web_state_observer_bridge_unittest.mm
index 982fdd9ccc092014556168b9f587002890a42f8e..03427475506bd374b143838608357d40c6726038 100644
--- a/ios/web/web_state/web_state_observer_bridge_unittest.mm
+++ b/ios/web/web_state/web_state_observer_bridge_unittest.mm
@@ -4,7 +4,6 @@
#import "ios/web/public/web_state/web_state_observer_bridge.h"
-#import "base/mac/scoped_nsobject.h"
#include "base/memory/ptr_util.h"
#include "ios/web/public/favicon_url.h"
#import "ios/web/public/test/fakes/crw_test_web_state_observer.h"
@@ -14,6 +13,10 @@
#include "net/http/http_response_headers.h"
#include "testing/platform_test.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace web {
namespace {
const char kRawResponseHeaders[] =
@@ -28,12 +31,12 @@ class WebStateObserverBridgeTest : public PlatformTest {
WebStateObserverBridgeTest()
: observer_([[CRWTestWebStateObserver alloc] init]),
bridge_(base::MakeUnique<WebStateObserverBridge>(&test_web_state_,
- observer_.get())),
+ observer_)),
response_headers_(new net::HttpResponseHeaders(
std::string(kRawResponseHeaders, sizeof(kRawResponseHeaders)))) {}
web::TestWebState test_web_state_;
- base::scoped_nsobject<CRWTestWebStateObserver> observer_;
+ CRWTestWebStateObserver* observer_;
std::unique_ptr<WebStateObserverBridge> bridge_;
scoped_refptr<net::HttpResponseHeaders> response_headers_;
};
« no previous file with comments | « ios/web/web_state/web_state_impl_unittest.mm ('k') | ios/web/web_state/web_state_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698