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

Unified Diff: content/browser/web_contents/web_contents_impl_browsertest.cc

Issue 2625703002: [MediaNotification] Don't check HTTP status code for image fetch (Closed)
Patch Set: fixed junit test & cl format Created 3 years, 11 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 | « chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaImageManagerTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl_browsertest.cc
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
index bcb9a6facc837a2f631cc43254f9dfea4b159a9a..976b7fc74120b689ad5b42e8cff4a9b5c7a31ea5 100644
--- a/content/browser/web_contents/web_contents_impl_browsertest.cc
+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -1174,10 +1174,12 @@ class DownloadImageObserver {
};
void DownloadImageTestInternal(Shell* shell,
- const GURL &image_url,
- int expected_http_status) {
+ const GURL& image_url,
+ int expected_http_status,
+ int expected_number_of_images) {
using ::testing::_;
using ::testing::InvokeWithoutArgs;
+ using ::testing::SizeIs;
// Set up everything.
DownloadImageObserver download_image_observer;
@@ -1186,7 +1188,8 @@ void DownloadImageTestInternal(Shell* shell,
// Set up expectation and stub.
EXPECT_CALL(download_image_observer,
- OnFinishDownloadImage(_, expected_http_status, _, _, _));
+ OnFinishDownloadImage(_, expected_http_status, _,
+ SizeIs(expected_number_of_images), _));
ON_CALL(download_image_observer, OnFinishDownloadImage(_, _, _, _, _))
.WillByDefault(
InvokeWithoutArgs(loop_runner.get(), &MessageLoopRunner::Quit));
@@ -1218,16 +1221,26 @@ void ExpectNoValidImageCallback(const base::Closure& quit_closure,
IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
DownloadImage_HttpImage) {
ASSERT_TRUE(embedded_test_server()->Start());
- const GURL kImageUrl =
- embedded_test_server()->GetURL("/image.jpg");
- DownloadImageTestInternal(shell(), kImageUrl, 200);
+ const GURL kImageUrl = embedded_test_server()->GetURL("/single_face.jpg");
+ DownloadImageTestInternal(shell(), kImageUrl, 200, 1);
}
IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
DownloadImage_Deny_FileImage) {
+ ASSERT_TRUE(embedded_test_server()->Start());
+ shell()->LoadURL(embedded_test_server()->GetURL("/simple_page.html"));
+
+ const GURL kImageUrl = GetTestUrl("", "single_face.jpg");
+ DownloadImageTestInternal(shell(), kImageUrl, 0, 0);
+}
+
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
+ DownloadImage_Allow_FileImage) {
+ shell()->LoadURL(GetTestUrl("", "simple_page.html"));
+
const GURL kImageUrl =
GetTestUrl("", "image.jpg");
- DownloadImageTestInternal(shell(), kImageUrl, 0);
+ DownloadImageTestInternal(shell(), kImageUrl, 0, 0);
}
IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, DownloadImage_NoValidImage) {
@@ -1242,6 +1255,19 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, DownloadImage_NoValidImage) {
run_loop.Run();
}
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, DownloadImage_DataImage) {
+ const GURL kImageUrl = GURL(
+ "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHE"
+ "lEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==");
+ DownloadImageTestInternal(shell(), kImageUrl, 0, 1);
+}
+
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
+ DownloadImage_InvalidDataImage) {
+ const GURL kImageUrl = GURL("data:image/png;invalid");
+ DownloadImageTestInternal(shell(), kImageUrl, 0, 0);
+}
+
class MouseLockDelegate : public WebContentsDelegate {
public:
// WebContentsDelegate:
« no previous file with comments | « chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaImageManagerTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698