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

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

Issue 2618633004: Add support for Animated PNG (Closed)
Patch Set: Use a custom allocator in GIFImageDecoderTest 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 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 ASSERT_EQ(MockResourceLoader::Status::IDLE, mock_loader.status()); 614 ASSERT_EQ(MockResourceLoader::Status::IDLE, mock_loader.status());
615 615
616 // Process all messages to ensure proper test teardown. 616 // Process all messages to ensure proper test teardown.
617 content::RunAllPendingInMessageLoop(); 617 content::RunAllPendingInMessageLoop();
618 } 618 }
619 619
620 // Test that the proper Accept: header is set based on the ResourceType 620 // Test that the proper Accept: header is set based on the ResourceType
621 TEST_F(MimeSniffingResourceHandlerTest, AcceptHeaders) { 621 TEST_F(MimeSniffingResourceHandlerTest, AcceptHeaders) {
622 EXPECT_EQ( 622 EXPECT_EQ(
623 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp," 623 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,"
624 "*/*;q=0.8", 624 "image/apng,*/*;q=0.8",
625 TestAcceptHeaderSetting(RESOURCE_TYPE_MAIN_FRAME)); 625 TestAcceptHeaderSetting(RESOURCE_TYPE_MAIN_FRAME));
626 EXPECT_EQ( 626 EXPECT_EQ(
627 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp," 627 "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,"
628 "*/*;q=0.8", 628 "image/apng,*/*;q=0.8",
629 TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_FRAME)); 629 TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_FRAME));
630 EXPECT_EQ("text/css,*/*;q=0.1", 630 EXPECT_EQ("text/css,*/*;q=0.1",
631 TestAcceptHeaderSetting(RESOURCE_TYPE_STYLESHEET)); 631 TestAcceptHeaderSetting(RESOURCE_TYPE_STYLESHEET));
632 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SCRIPT)); 632 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SCRIPT));
633 EXPECT_EQ("image/webp,image/*,*/*;q=0.8", 633 EXPECT_EQ("image/webp,image/apng,image/*,*/*;q=0.8",
634 TestAcceptHeaderSetting(RESOURCE_TYPE_IMAGE)); 634 TestAcceptHeaderSetting(RESOURCE_TYPE_IMAGE));
635 EXPECT_EQ("image/webp,image/*,*/*;q=0.8", 635 EXPECT_EQ("image/webp,image/apng,image/*,*/*;q=0.8",
636 TestAcceptHeaderSetting(RESOURCE_TYPE_FAVICON)); 636 TestAcceptHeaderSetting(RESOURCE_TYPE_FAVICON));
637 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_FONT_RESOURCE)); 637 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_FONT_RESOURCE));
638 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_RESOURCE)); 638 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SUB_RESOURCE));
639 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_OBJECT)); 639 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_OBJECT));
640 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_MEDIA)); 640 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_MEDIA));
641 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_WORKER)); 641 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_WORKER));
642 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SHARED_WORKER)); 642 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_SHARED_WORKER));
643 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PREFETCH)); 643 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PREFETCH));
644 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_XHR)); 644 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_XHR));
645 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PING)); 645 EXPECT_EQ("*/*", TestAcceptHeaderSetting(RESOURCE_TYPE_PING));
(...skipping 306 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