Chromium Code Reviews| 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 30aef3729bf6b19152255c5945c3951e0a48b7d5..d816a0b1afb96906ca72bfae43f0d5ff97eb9ef2 100644 |
| --- a/ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm |
| +++ b/ios/chrome/browser/ui/downloads/download_manager_controller_unittest.mm |
| @@ -11,6 +11,8 @@ |
| #import "base/mac/scoped_nsobject.h" |
| #include "base/message_loop/message_loop.h" |
| #import "ios/chrome/browser/store_kit/store_kit_launcher.h" |
| +#import "ios/chrome/browser/store_kit/store_kit_tab_helper.h" |
| +#import "ios/chrome/browser/web/chrome_web_test.h" |
| #include "ios/web/public/test/test_web_thread.h" |
| #include "net/base/net_errors.h" |
| #include "net/http/http_response_headers.h" |
| @@ -19,6 +21,7 @@ |
| #include "net/url_request/url_request_test_util.h" |
| #include "testing/gtest_mac.h" |
| #include "testing/platform_test.h" |
| +#import "third_party/ocmock/OCMock/OCMock.h" |
| using net::HttpResponseHeaders; |
| using net::URLRequestStatus; |
| @@ -41,45 +44,25 @@ using net::URLRequestStatus; |
| - (long long)totalFileSize; |
| @end |
| -@interface TestStoreKitLauncher : NSObject<StoreKitLauncher> |
| -@end |
| - |
| -@implementation TestStoreKitLauncher |
| -- (void)openAppStore:(NSString*)appId { |
| -} |
| -@end |
| - |
| namespace { |
| const GURL kTestURL = GURL("http://www.example.com/test_download_file.txt"); |
| -class DownloadManagerControllerTest : public PlatformTest { |
| - public: |
| - DownloadManagerControllerTest() |
| - : _message_loop(base::MessageLoop::TYPE_UI), |
| - _ui_thread(web::WebThread::UI, &_message_loop) {} |
| - |
| +class DownloadManagerControllerTest : public ChromeWebTest { |
|
rohitrao (ping after 24h)
2017/03/07 13:51:22
These changes end up making the test more heavywei
pkl (ping after 24h if needed)
2017/03/07 22:07:19
Acknowledged.
|
| protected: |
| void SetUp() override { |
| - PlatformTest::SetUp(); |
| - |
| - _request_context_getter = |
| - new net::TestURLRequestContextGetter(_message_loop.task_runner()); |
| - |
| + ChromeWebTest::SetUp(); |
| _fetcher_factory.reset(new net::TestURLFetcherFactory()); |
| - |
| - _store_kit_launcher.reset([[TestStoreKitLauncher alloc] init]); |
| - |
| + StoreKitTabHelper::CreateForWebState(web_state()); |
| + StoreKitTabHelper* helper = StoreKitTabHelper::FromWebState(web_state()); |
| + id mock_launcher = |
| + [OCMockObject niceMockForProtocol:@protocol(StoreKitLauncher)]; |
| + helper->SetLauncher(mock_launcher); |
| _controller.reset([[DownloadManagerController alloc] |
| - initWithURL:kTestURL |
| - requestContextGetter:_request_context_getter.get() |
| - storeKitLauncher:_store_kit_launcher.get()]); |
| + initWithWebState:web_state() |
| + downloadURL:kTestURL]); |
| } |
| - base::MessageLoop _message_loop; |
| - web::TestWebThread _ui_thread; |
| - base::scoped_nsobject<TestStoreKitLauncher> _store_kit_launcher; |
| - scoped_refptr<net::TestURLRequestContextGetter> _request_context_getter; |
| std::unique_ptr<net::TestURLFetcherFactory> _fetcher_factory; |
| base::scoped_nsobject<DownloadManagerController> _controller; |
| }; |