Expose details for appcache error events [Chromium]

webkit/browser/appcache/appcache_update_job.h

 // Copyright (c) 2012 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.
 
 #ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_
 #define WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 109 matching lines @@
     AppCacheResponseWriter* response_writer() const {
       return response_writer_.get();
     }
     void set_existing_response_headers(net::HttpResponseHeaders* headers) {
       existing_response_headers_ = headers;
     }
     void set_existing_entry(const AppCacheEntry& entry) {
       existing_entry_ = entry;
     }
     ResultType result() const { return result_; }
+    int canceled_response_code() const { return redirect_response_code_; }
 
    private:
     // URLRequest::Delegate overrides
     virtual void OnReceivedRedirect(net::URLRequest* request,
                                     const GURL& new_url,
                                     bool* defer_redirect) OVERRIDE;
     virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
     virtual void OnReadCompleted(net::URLRequest* request,
                                  int bytes_read) OVERRIDE;
 
     void AddConditionalHeaders(const net::HttpResponseHeaders* headers);
     void OnWriteComplete(int result);
     void ReadResponseData();
     bool ConsumeResponseData(int bytes_read);
     void OnResponseCompleted();
     bool MaybeRetryRequest();
 
     GURL url_;
     AppCacheUpdateJob* job_;
     FetchType fetch_type_;
     int retry_503_attempts_;
     scoped_refptr<net::IOBuffer> buffer_;
     scoped_ptr<net::URLRequest> request_;
     AppCacheEntry existing_entry_;
     scoped_refptr<net::HttpResponseHeaders> existing_response_headers_;
     std::string manifest_data_;
     ResultType result_;
+    int redirect_response_code_;
     scoped_ptr<AppCacheResponseWriter> response_writer_;
   };  // class URLFetcher
 
   AppCacheResponseWriter* CreateResponseWriter();
 
   // Methods for AppCacheStorage::Delegate.
   virtual void OnResponseInfoLoaded(AppCacheResponseInfo* response_info,
                                     int64 response_id) OVERRIDE;
   virtual void OnGroupAndNewestCacheStored(AppCacheGroup* group,
                                            AppCache* newest_cache,
                                            bool success,
                                            bool would_exceed_quota) OVERRIDE;
-  virtual void OnGroupMadeObsolete(AppCacheGroup* group, bool success) OVERRIDE;
+  virtual void OnGroupMadeObsolete(AppCacheGroup* group,
+                                   bool success,
+                                   int response_code) OVERRIDE;
 
   // Methods for AppCacheHost::Observer.
   virtual void OnCacheSelectionComplete(AppCacheHost* host) OVERRIDE {}  // N/A
   virtual void OnDestructionImminent(AppCacheHost* host) OVERRIDE;
 
   // Methods for AppCacheService::Observer.
   virtual void OnServiceReinitialized(
       AppCacheStorageReference* old_storage) OVERRIDE;
 
-  void HandleCacheFailure(const std::string& error_message,
+  void HandleCacheFailure(const ErrorDetails& details,
                           ResultType result,
                           const GURL& failed_resource_url);
 
   void FetchManifest(bool is_first_fetch);
   void HandleManifestFetchCompleted(URLFetcher* fetcher);
   void ContinueHandleManifestFetchCompleted(bool changed);
 
   void HandleUrlFetchCompleted(URLFetcher* fetcher);
   void HandleMasterEntryFetchCompleted(URLFetcher* fetcher);
 
   void HandleManifestRefetchCompleted(URLFetcher* fetcher);
   void OnManifestInfoWriteComplete(int result);
   void OnManifestDataWriteComplete(int result);
 
   void StoreGroupAndCache();
 
   void NotifySingleHost(AppCacheHost* host, EventID event_id);
   void NotifyAllAssociatedHosts(EventID event_id);
   void NotifyAllProgress(const GURL& url);
   void NotifyAllFinalProgress();
-  void NotifyAllError(const std::string& error_message);
+  void NotifyAllError(const ErrorDetails& detals);
   void AddAllAssociatedHostsToNotifier(HostNotifier* notifier);
 
   // Checks if manifest is byte for byte identical with the manifest
   // in the newest application cache.
   void CheckIfManifestChanged();
   void OnManifestDataReadComplete(int result);
 
   // Creates the list of files that may need to be fetched and initiates
   // fetches. Section 6.9.4 steps 12-17
   void BuildUrlFileList(const Manifest& manifest);
   void AddUrlToFileList(const GURL& url, int type);
   void FetchUrls();
   void CancelAllUrlFetches();
   bool ShouldSkipUrlFetch(const AppCacheEntry& entry);
 
   // If entry already exists in the cache currently being updated, merge
   // the entry type information with the existing entry.
   // Returns true if entry exists in cache currently being updated.
   bool AlreadyFetchedEntry(const GURL& url, int entry_type);
 
   // TODO(jennb): Delete when update no longer fetches master entries directly.
   // Creates the list of master entries that need to be fetched and initiates
   // fetches.
   void AddMasterEntryToFetchList(AppCacheHost* host, const GURL& url,
                                  bool is_new);
   void FetchMasterEntries();
-  void CancelAllMasterEntryFetches(const std::string& error_message);
+  void CancelAllMasterEntryFetches(const ErrorDetails& details);
 
   // Asynchronously loads the entry from the newest complete cache if the
   // HTTP caching semantics allow.
   // Returns false if immediately obvious that data cannot be loaded from
   // newest complete cache.
   bool MaybeLoadFromNewestCache(const GURL& url, AppCacheEntry& entry);
   void LoadFromNewestCacheFailed(const GURL& url,
                                  AppCacheResponseInfo* newest_response_info);
 
   // Does nothing if update process is still waiting for pending master
@@ skipping 92 matching lines @@
   AppCacheStorage* storage_;
 
   FRIEND_TEST_ALL_PREFIXES(AppCacheGroupTest, QueueUpdate);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheUpdateJob);
 };
 
 }  // namespace appcache
 
 #endif  // WEBKIT_BROWSER_APPCACHE_APPCACHE_UPDATE_JOB_H_