Expand CRX magic number list in sniffer for CRX3

Bug: 831284
Change-Id: I84d27cfb61725524d1ec9b12ffaa1bda221529ff
Reviewed-on: https://chromium-review.googlesource.com/1005797Reviewed-by: Asanka Herath <asanka@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549887}

net/base/mime_sniffer.cc

@@ -687,8 +687,8 @@ static bool SniffCRX(const char* content,
   // sniffing gives us less room for error. If the version number ever changes,
   // we can just add an entry to this list.
   static const struct MagicNumber kCRXMagicNumbers[] = {
-    MAGIC_NUMBER("application/x-chrome-extension", "Cr24\x02\x00\x00\x00")
-  };
+      MAGIC_NUMBER("application/x-chrome-extension", "Cr24\x02\x00\x00\x00"),
+      MAGIC_NUMBER("application/x-chrome-extension", "Cr24\x03\x00\x00\x00")};
 
   // Only consider files that have the extension ".crx".
   if (!base::EndsWith(url.path_piece(), ".crx", base::CompareCase::SENSITIVE))

net/base/mime_sniffer_unittest.cc

@@ -96,65 +96,54 @@ TEST(MimeSnifferTest, BasicSniffingTest) {
 TEST(MimeSnifferTest, ChromeExtensionsTest) {
   SnifferTest tests[] = {
       // schemes
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.crx",
-      "", "application/x-chrome-extension" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "https://www.example.com/foo.crx",
-      "", "application/x-chrome-extension" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "ftp://www.example.com/foo.crx",
-      "", "application/x-chrome-extension" },
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.crx", "", "application/x-chrome-extension"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "https://www.example.com/foo.crx", "", "application/x-chrome-extension"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "ftp://www.example.com/foo.crx", "", "application/x-chrome-extension"},
 
       // some other mimetypes that should get converted
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.crx",
-      "text/plain", "application/x-chrome-extension" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.crx",
-      "application/octet-stream", "application/x-chrome-extension" },
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.crx", "text/plain",
+       "application/x-chrome-extension"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.crx", "application/octet-stream",
+       "application/x-chrome-extension"},
 
       // success edge cases
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.crx?query=string",
-      "", "application/x-chrome-extension" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo..crx",
-      "", "application/x-chrome-extension" },
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.crx?query=string", "",
+       "application/x-chrome-extension"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo..crx", "", "application/x-chrome-extension"},
+      {"Cr24\x03\x00\x00\x00", sizeof("Cr24\x03\x00\x00\x00") - 1,
+       "http://www.example.com/foo..crx", "", "application/x-chrome-extension"},
 
       // wrong file extension
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.bin",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.bin?monkey",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "invalid-url",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foocrx",
-      "", "application/octet-stream" },
-    { "Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.crx.blech",
-      "", "application/octet-stream" },
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.bin", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.bin?monkey", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "invalid-url", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foocrx", "", "application/octet-stream"},
+      {"Cr24\x02\x00\x00\x00", sizeof("Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.crx.blech", "", "application/octet-stream"},
 
       // wrong magic
-    { "Cr24\x02\x00\x00\x01", sizeof("Cr24\x02\x00\x00\x01")-1,
-      "http://www.example.com/foo.crx?monkey",
-      "", "application/octet-stream" },
-    { "PADDING_Cr24\x02\x00\x00\x00", sizeof("PADDING_Cr24\x02\x00\x00\x00")-1,
-      "http://www.example.com/foo.crx?monkey",
-      "", "application/octet-stream" },
+      {"Cr24\x02\x00\x00\x01", sizeof("Cr24\x02\x00\x00\x01") - 1,
+       "http://www.example.com/foo.crx?monkey", "", "application/octet-stream"},
+      {"PADDING_Cr24\x02\x00\x00\x00",
+       sizeof("PADDING_Cr24\x02\x00\x00\x00") - 1,
+       "http://www.example.com/foo.crx?monkey", "", "application/octet-stream"},
   };
 
   TestArray(tests, arraysize(tests));