more uma stats

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>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
+#include "base/time/time.h"
 #include "net/base/completion_callback.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 #include "webkit/browser/appcache/appcache.h"
 #include "webkit/browser/appcache/appcache_host.h"
 #include "webkit/browser/appcache/appcache_response.h"
 #include "webkit/browser/appcache/appcache_service.h"
 #include "webkit/browser/appcache/appcache_storage.h"
 #include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
 
 namespace appcache {
 
 class HostNotifier;
 
 // Application cache Update algorithm and state.
 class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheUpdateJob
     : public AppCacheStorage::Delegate,
       public AppCacheHost::Observer,
       public AppCacheService::Observer {
  public:
   // Used for uma stats only for now, so new values are append only.
   enum ResultType {
     UPDATE_OK, DB_ERROR, DISKCACHE_ERROR, QUOTA_ERROR, REDIRECT_ERROR,
-    MANIFEST_ERROR, NETWORK_ERROR, SERVER_ERROR,
+    MANIFEST_ERROR, NETWORK_ERROR, SERVER_ERROR, CANCELLED_ERROR,
     NUM_UPDATE_JOB_RESULT_TYPES
   };
 
   AppCacheUpdateJob(AppCacheService* service, AppCacheGroup* group);
   virtual ~AppCacheUpdateJob();
 
   // Triggers the update process or adds more info if this update is already
   // in progress.
   void StartUpdate(AppCacheHost* host, const GURL& new_master_resource);
 
@@ skipping 116 matching lines @@
   virtual void OnGroupMadeObsolete(AppCacheGroup* group, bool success) 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, ResultType result);
+  void HandleCacheFailure(const std::string& error_message,
+                          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);
@@ skipping 49 matching lines @@
 
   // Schedules a rerun of the entire update with the same parameters as
   // this update job after a short delay.
   void ScheduleUpdateRetry(int delay_ms);
 
   void Cancel();
   void ClearPendingMasterEntries();
   void DiscardInprogressCache();
   void DiscardDuplicateResponses();
 
+  void LogHistogramStats(ResultType result, const GURL& failed_resource_url);
+  void MadeProgress() { last_progress_time_ = base::Time::Now(); }
+
   // Deletes this object after letting the stack unwind.
   void DeleteSoon();
 
   bool IsTerminating() { return internal_state_ >= REFETCH_MANIFEST ||
                                 stored_state_ != UNSTORED; }
 
   AppCacheService* service_;
   const GURL manifest_url_;  // here for easier access
 
   // Defined prior to refs to AppCaches and Groups because destruction
   // order matters, the disabled_storage_reference_ must outlive those
   // objects.
   scoped_refptr<AppCacheStorageReference> disabled_storage_reference_;
 
   scoped_refptr<AppCache> inprogress_cache_;
 
   AppCacheGroup* group_;
 
   UpdateType update_type_;
   InternalUpdateState internal_state_;
+  base::Time last_progress_time_;
 
   PendingMasters pending_master_entries_;
   size_t master_entries_completed_;
 
   // TODO(jennb): Delete when update no longer fetches master entries directly.
   // Helper containers to track which pending master entries have yet to be
   // fetched and which are currently being fetched. Master entries that
   // are listed in the manifest may be fetched as a regular URL instead of
   // as a separate master entry fetch to optimize against duplicate fetches.
   std::set<GURL> master_entries_to_fetch_;
@@ skipping 45 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_