No longer check for a specific mime-type on appcache manifest files.

webkit/appcache/appcache_update_job.cc

 // Copyright (c) 2011 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 "base/stringprintf.h"
@@ skipping 420 matching lines @@
 
 
 void AppCacheUpdateJob::HandleManifestFetchCompleted(
     URLFetcher* fetcher) {
   DCHECK_EQ(internal_state_, FETCH_MANIFEST);
   DCHECK_EQ(manifest_fetcher_, fetcher);
   manifest_fetcher_ = NULL;
 
   net::URLRequest* request = fetcher->request();
   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 (is_valid_response_code && is_valid_mime_type) {
+  if (is_valid_response_code) {
     manifest_data_ = fetcher->manifest_data();
     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) &&
              update_type_ == UPGRADE_ATTEMPT) {
     service_->storage()->MakeGroupObsolete(group_, this);  // async
   } else {
-    std::string message;
-    if (!is_valid_response_code) {
-      const char* kFormatString = "Manifest fetch failed (%d) %s";
-      message = base::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 = base::StringPrintf(kFormatString, mime_type.c_str(),
-                                   manifest_url_.spec().c_str());
-    }
+    const char* kFormatString = "Manifest fetch failed (%d) %s";
+    std::string message = base::StringPrintf(kFormatString, response_code,
+                                             manifest_url_.spec().c_str());
     HandleCacheFailure(message);
   }
 }
 
 void AppCacheUpdateJob::OnGroupMadeObsolete(AppCacheGroup* group,
                                             bool success) {
   DCHECK(master_entry_fetches_.empty());
   CancelAllMasterEntryFetches("The cache has been made obsolete, "
                               "the manifest file returned 404 or 410");
   if (success) {
@@ skipping 388 matching lines @@
   }
 }
 
 void AppCacheUpdateJob::BuildUrlFileList(const Manifest& manifest) {
   for (base::hash_set<std::string>::const_iterator it =
            manifest.explicit_urls.begin();
        it != manifest.explicit_urls.end(); ++it) {
     AddUrlToFileList(GURL(*it), AppCacheEntry::EXPLICIT);
   }
 
+  // TODO(michaeln): Add resources from intercept namepsaces too.
+  // http://code.google.com/p/chromium/issues/detail?id=101565
+
   const std::vector<FallbackNamespace>& fallbacks =
       manifest.fallback_namespaces;
   for (std::vector<FallbackNamespace>::const_iterator it = fallbacks.begin();
        it != fallbacks.end(); ++it) {
      AddUrlToFileList(it->second, AppCacheEntry::FALLBACK);
   }
 
   // Add all master entries from newest complete cache.
   if (update_type_ == UPGRADE_ATTEMPT) {
     const AppCache::EntryMap& entries =
@@ skipping 431 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