Merge r181075 - Unreviewed. Fix /webkit2/WebKitWebResource/mime-type …

…after r180927.

In r180927 we updated the libsoup version used by the jhbuild. In
this new version the sniffer uses image/x-icon instead of
image/vnd.microsoft.icon for blank.ico resource.

* TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
(testWebResourceMimeType):

Tools/ChangeLog

@@ -1,3 +1,14 @@
+2015-03-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix /webkit2/WebKitWebResource/mime-type after r180927.
+
+        In r180927 we updated the libsoup version used by the jhbuild. In
+        this new version the sniffer uses image/x-icon instead of
+        image/vnd.microsoft.icon for blank.ico resource.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
+        (testWebResourceMimeType):
+
 2015-03-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [SOUP] Check TLS errors as soon as they are set in the SoupMessage

Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp

@@ -419,7 +419,7 @@ static void testWebResourceMimeType(SingleResourceLoadTest* test, gconstpointer)
 
     test->loadURI(kServer->getURIForPath("/image.html").data());
     response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();
-    g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "image/vnd.microsoft.icon");
+    g_assert_cmpstr(webkit_uri_response_get_mime_type(response), ==, "image/x-icon");
 
     test->loadURI(kServer->getURIForPath("/redirected-css.html").data());
     response = test->waitUntilResourceLoadFinishedAndReturnURIResponse();