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

Side by Side Diff: content/browser/loader/mime_sniffing_resource_handler_unittest.cc

Issue 2618633004: Add support for Animated PNG (Closed)
Patch Set: Respond to comments Created 3 years, 9 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/mime_sniffing_resource_handler.h" 5 #include "content/browser/loader/mime_sniffing_resource_handler.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ASSERT_EQ(MockResourceLoader::Status::IDLE, mock_loader.status()); 588 ASSERT_EQ(MockResourceLoader::Status::IDLE, mock_loader.status());
589 589
590 // Process all messages to ensure proper test teardown. 590 // Process all messages to ensure proper test teardown.
591 content::RunAllPendingInMessageLoop(); 591 content::RunAllPendingInMessageLoop();
592 } 592 }
593 593
594 // Test that the proper Accept: header is set based on the ResourceType 594 // Test that the proper Accept: header is set based on the ResourceType
595 TEST_F(MimeSniffingResourceHandlerTest, AcceptHeaders) { 595 TEST_F(MimeSniffingResourceHandlerTest, AcceptHeaders) {
596 EXPECT_EQ( 596 EXPECT_EQ(
597 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp," 597 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,"
598 "*/*;q=0.8", 598 "image/apng,*/*;q=0.8",
599 TestAcceptHeaderSetting(RESOURCE_TYPE_MAIN_FRAME)); 599 TestAcceptHeaderSetting(RESOURCE_TYPE_MAIN_FRAME));
600 EXPECT_EQ( 600 EXPECT_EQ(
601 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp," 601 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,"
602 "*/*;q=0.8", 602 "image/apng,*/*;q=0.8",
603 TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_FRAME)); 603 TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_FRAME));
604 EXPECT_EQ("text/css,*/*;q=0.1", 604 EXPECT_EQ("text/css,*/*;q=0.1",
605 TestAcceptHeaderSetting(RESOURCE_TYPE_STYLESHEET)); 605 TestAcceptHeaderSetting(RESOURCE_TYPE_STYLESHEET));
606 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SCRIPT)); 606 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SCRIPT));
607 EXPECT_EQ("image/webp,image/*,*/*;q=0.8", 607 EXPECT_EQ("image/webp,image/apng,image/*,*/*;q=0.8",
608 TestAcceptHeaderSetting(RESOURCE_TYPE_IMAGE)); 608 TestAcceptHeaderSetting(RESOURCE_TYPE_IMAGE));
609 EXPECT_EQ("image/webp,image/*,*/*;q=0.8", 609 EXPECT_EQ("image/webp,image/apng,image/*,*/*;q=0.8",
610 TestAcceptHeaderSetting(RESOURCE_TYPE_FAVICON)); 610 TestAcceptHeaderSetting(RESOURCE_TYPE_FAVICON));
611 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_FONT_RESOURCE)); 611 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_FONT_RESOURCE));
612 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_RESOURCE)); 612 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_RESOURCE));
613 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_OBJECT)); 613 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_OBJECT));
614 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_MEDIA)); 614 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_MEDIA));
615 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_WORKER)); 615 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_WORKER));
616 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SHARED_WORKER)); 616 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SHARED_WORKER));
617 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PREFETCH)); 617 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PREFETCH));
618 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_XHR)); 618 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_XHR));
619 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PING)); 619 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PING));
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 // on OnResponseStarted. 952 // on OnResponseStarted.
953 EXPECT_EQ(MockResourceLoader::Status::CANCELED, 953 EXPECT_EQ(MockResourceLoader::Status::CANCELED,
954 mock_loader.OnResponseStarted(std::move(response))); 954 mock_loader.OnResponseStarted(std::move(response)));
955 EXPECT_EQ(net::ERR_ABORTED, mock_loader.error_code()); 955 EXPECT_EQ(net::ERR_ABORTED, mock_loader.error_code());
956 956
957 // Process all messages to ensure proper test teardown. 957 // Process all messages to ensure proper test teardown.
958 content::RunAllPendingInMessageLoop(); 958 content::RunAllPendingInMessageLoop();
959 } 959 }
960 960
961 } // namespace content 961 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698