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

Unified Diff: content/child/notifications/pending_notifications_tracker_unittest.cc

Issue 1845323002: Remove WebUnitTestSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | content/test/test_blink_web_unit_test_support.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/notifications/pending_notifications_tracker_unittest.cc
diff --git a/content/child/notifications/pending_notifications_tracker_unittest.cc b/content/child/notifications/pending_notifications_tracker_unittest.cc
index 5aabbc5010e828c26e47e52a71a99d60e4c23ad1..d06ee97261113733ef9b93e24c275b8ee7cbf0ba 100644
--- a/content/child/notifications/pending_notifications_tracker_unittest.cc
+++ b/content/child/notifications/pending_notifications_tracker_unittest.cc
@@ -25,8 +25,8 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
+#include "third_party/WebKit/public/platform/WebURLLoaderMockFactory.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "third_party/WebKit/public/platform/WebUnitTestSupport.h"
#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationData.h"
#include "third_party/WebKit/public/platform/modules/notifications/WebNotificationDelegate.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -60,7 +60,7 @@ class PendingNotificationsTrackerTest : public testing::Test {
base::ThreadTaskRunnerHandle::Get())) {}
~PendingNotificationsTrackerTest() override {
- UnitTestSupport()->unregisterAllMockedURLs();
+ GetURLLoaderMockFactory()->unregisterAllURLs();
}
void DidFetchResources(size_t index, const NotificationResources& resources) {
@@ -87,8 +87,8 @@ class PendingNotificationsTrackerTest : public testing::Test {
return tracker_->delegate_to_pending_id_map_.size();
}
- blink::WebUnitTestSupport* UnitTestSupport() {
- return blink::Platform::current()->unitTestSupport();
+ blink::WebURLLoaderMockFactory* GetURLLoaderMockFactory() {
+ return blink::Platform::current()->getURLLoaderMockFactory();
}
// Registers a mocked url. When fetched, |file_name| will be loaded from the
@@ -111,7 +111,7 @@ class PendingNotificationsTrackerTest : public testing::Test {
blink::WebString string_file_path =
blink::WebString::fromUTF8(file_path.MaybeAsASCII());
- UnitTestSupport()->registerMockedURL(url, response, string_file_path);
+ GetURLLoaderMockFactory()->registerURL(url, response, string_file_path);
return url;
}
@@ -127,7 +127,7 @@ class PendingNotificationsTrackerTest : public testing::Test {
blink::WebURLError error;
error.reason = 404;
- UnitTestSupport()->registerMockedErrorURL(url, response, error);
+ GetURLLoaderMockFactory()->registerErrorURL(url, response, error);
return url;
}
@@ -157,7 +157,7 @@ TEST_F(PendingNotificationsTrackerTest, OneNotificationMultipleResources) {
ASSERT_EQ(0u, CountResources());
base::RunLoop().RunUntilIdle();
- UnitTestSupport()->serveAsynchronousMockedRequests();
+ GetURLLoaderMockFactory()->serveAsynchronousRequests();
ASSERT_EQ(0u, CountPendingNotifications());
ASSERT_EQ(1u, CountResources());
@@ -194,7 +194,7 @@ TEST_F(PendingNotificationsTrackerTest, LargeIconsAreScaledDown) {
ASSERT_EQ(0u, CountResources());
base::RunLoop().RunUntilIdle();
- UnitTestSupport()->serveAsynchronousMockedRequests();
+ GetURLLoaderMockFactory()->serveAsynchronousRequests();
ASSERT_EQ(0u, CountPendingNotifications());
ASSERT_EQ(1u, CountResources());
@@ -240,7 +240,7 @@ TEST_F(PendingNotificationsTrackerTest, TwoNotifications) {
ASSERT_EQ(0u, CountResources());
base::RunLoop().RunUntilIdle();
- UnitTestSupport()->serveAsynchronousMockedRequests();
+ GetURLLoaderMockFactory()->serveAsynchronousRequests();
ASSERT_EQ(0u, CountPendingNotifications());
ASSERT_EQ(2u, CountResources());
@@ -265,7 +265,7 @@ TEST_F(PendingNotificationsTrackerTest, FetchError) {
ASSERT_EQ(0u, CountResources());
base::RunLoop().RunUntilIdle();
- UnitTestSupport()->serveAsynchronousMockedRequests();
+ GetURLLoaderMockFactory()->serveAsynchronousRequests();
ASSERT_EQ(0u, CountPendingNotifications());
ASSERT_EQ(1u, CountResources());
« no previous file with comments | « no previous file | content/test/test_blink_web_unit_test_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698