Index: ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm |
diff --git a/ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm b/ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm |
index 427329996e5356344038368dfcccdf9dfcda6b5e..c39fd4d43bcf514dd64cc80562a4e0f54f0e36b2 100644 |
--- a/ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm |
+++ b/ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm |
@@ -8,7 +8,6 @@ |
#include <memory> |
-#import "base/mac/scoped_nsobject.h" |
#include "base/message_loop/message_loop.h" |
#import "ios/chrome/browser/storekit_launcher.h" |
#include "ios/web/public/test/test_web_thread.h" |
@@ -20,6 +19,10 @@ |
#include "testing/gtest_mac.h" |
#include "testing/platform_test.h" |
+#if !defined(__has_feature) || !__has_feature(objc_arc) |
+#error "This file requires ARC support." |
+#endif |
+ |
using net::HttpResponseHeaders; |
using net::URLRequestStatus; |
@@ -68,20 +71,20 @@ class DownloadManagerControllerTest : public PlatformTest { |
_fetcher_factory.reset(new net::TestURLFetcherFactory()); |
- _store_kit_launcher.reset([[TestStoreKitLauncher alloc] init]); |
+ _store_kit_launcher = [[TestStoreKitLauncher alloc] init]; |
- _controller.reset([[DownloadManagerController alloc] |
+ _controller = [[DownloadManagerController alloc] |
initWithURL:kTestURL |
requestContextGetter:_request_context_getter.get() |
- storeKitLauncher:_store_kit_launcher.get()]); |
+ storeKitLauncher:_store_kit_launcher]; |
} |
base::MessageLoop _message_loop; |
web::TestWebThread _ui_thread; |
- base::scoped_nsobject<TestStoreKitLauncher> _store_kit_launcher; |
+ TestStoreKitLauncher* _store_kit_launcher; |
scoped_refptr<net::TestURLRequestContextGetter> _request_context_getter; |
std::unique_ptr<net::TestURLFetcherFactory> _fetcher_factory; |
- base::scoped_nsobject<DownloadManagerController> _controller; |
+ DownloadManagerController* _controller; |
noyau (Ping after 24h)
2017/02/03 12:57:48
Same here, I'm becoming more uncomfortable changin
stkhapugin
2017/02/03 13:05:57
This is a private unit test-only class in an imple
noyau (Ping after 24h)
2017/03/17 13:26:01
Sorry for the delay. These need strong as discusse
stkhapugin
2017/04/11 15:55:15
Done.
|
}; |
TEST_F(DownloadManagerControllerTest, TestXibViewConnections) { |