A better error message for the mime type of a manifest file being off....

webkit/appcache/appcache_update_job.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/appcache/appcache_update_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/io_buffer.h"
@@ skipping 489 matching lines @@
   delete request;
   return true;
 }
 
 void AppCacheUpdateJob::HandleManifestFetchCompleted(URLRequest* request) {
   DCHECK(internal_state_ == FETCH_MANIFEST);
   manifest_url_request_ = NULL;
 
   int response_code = -1;
   std::string mime_type;
+  bool is_valid_response_code = false;
+  bool is_valid_mime_type = false;
   if (request->status().is_success()) {
     response_code = request->GetResponseCode();
+    is_valid_response_code = (response_code / 100 == 2);
     request->GetMimeType(&mime_type);
+    is_valid_mime_type = (mime_type == kManifestMimeType);
   }
 
-  if ((response_code / 100 == 2) && mime_type == kManifestMimeType) {
+  if (is_valid_response_code && is_valid_mime_type) {
     manifest_response_info_.reset(
         new net::HttpResponseInfo(request->response_info()));
     if (update_type_ == UPGRADE_ATTEMPT)
       CheckIfManifestChanged();  // continues asynchronously
     else
       ContinueHandleManifestFetchCompleted(true);
   } else if (response_code == 304 && update_type_ == UPGRADE_ATTEMPT) {
     ContinueHandleManifestFetchCompleted(false);
   } else if (response_code == 404 || response_code == 410) {
     service_->storage()->MakeGroupObsolete(group_, this);  // async
   } else {
-    const char* kFormatString = "Manifest fetch failed (%d) %s";
-    const std::string message = StringPrintf(kFormatString, response_code,
-                                             manifest_url_.spec().c_str());
+    std::string message;
+    if (!is_valid_response_code) {
+      const char* kFormatString = "Manifest fetch failed (%d) %s";
+      message = StringPrintf(kFormatString, response_code,
+                             manifest_url_.spec().c_str());
+    } else {
+      DCHECK(!is_valid_mime_type);
+      const char* kFormatString = "Invalid manifest mime type (%s) %s";
+      message = StringPrintf(kFormatString, mime_type.c_str(),
+                             manifest_url_.spec().c_str());
+    }
     HandleCacheFailure(message);
   }
 }
 
 void AppCacheUpdateJob::OnGroupMadeObsolete(AppCacheGroup* group,
                                             bool success) {
   DCHECK(master_entry_fetches_.empty());
   CancelAllMasterEntryFetches("The group has been made obsolete");
   if (success) {
     DCHECK(group->is_obsolete());
@@ skipping 824 matching lines @@
 
   // Break the connection with the group so the group cannot call delete
   // on this object after we've posted a task to delete ourselves.
   group_->SetUpdateStatus(AppCacheGroup::IDLE);
   group_ = NULL;
 
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 }  // namespace appcache