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

Side by Side Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2683033005: URLLoaderMockFactory: clear MemoryCache in unregisterAllURLs (Closed)
Patch Set: fix Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 } while (false) 188 } while (false)
189 189
190 class WebFrameTest : public ::testing::Test { 190 class WebFrameTest : public ::testing::Test {
191 protected: 191 protected:
192 WebFrameTest() 192 WebFrameTest()
193 : m_baseURL("http://internal.test/"), 193 : m_baseURL("http://internal.test/"),
194 m_notBaseURL("http://external.test/"), 194 m_notBaseURL("http://external.test/"),
195 m_chromeURL("chrome://") {} 195 m_chromeURL("chrome://") {}
196 196
197 ~WebFrameTest() override { 197 ~WebFrameTest() override {
198 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); 198 Platform::current()
199 WebCache::clear(); 199 ->getURLLoaderMockFactory()
200 ->unregisterAllURLsAndClearMemoryCache();
200 } 201 }
201 202
202 void registerMockedHttpURLLoad(const std::string& fileName) { 203 void registerMockedHttpURLLoad(const std::string& fileName) {
203 registerMockedURLLoadFromBase(m_baseURL, fileName); 204 registerMockedURLLoadFromBase(m_baseURL, fileName);
204 } 205 }
205 206
206 void registerMockedChromeURLLoad(const std::string& fileName) { 207 void registerMockedChromeURLLoad(const std::string& fileName) {
207 registerMockedURLLoadFromBase(m_chromeURL, fileName); 208 registerMockedURLLoadFromBase(m_chromeURL, fileName);
208 } 209 }
209 210
(...skipping 11177 matching lines...) Expand 10 before | Expand all | Expand 10 after
11387 11388
11388 EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached()); 11389 EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
11389 EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading()); 11390 EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
11390 EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad()); 11391 EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
11391 EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents()); 11392 EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
11392 11393
11393 webViewHelper.reset(); 11394 webViewHelper.reset();
11394 } 11395 }
11395 11396
11396 } // namespace blink 11397 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698