Isolate initiation counts for downloads to their own histograms and improve

content/browser/download/download_stats.h

 // 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.
 //
 // Holds helpers for gathering UMA stats about downloads.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_STATS_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_STATS_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/browser/download/interrupt_reasons.h"
 
 namespace base {
 class Time;
 class TimeTicks;
 }
 
 namespace download_stats {
 
 // We keep a count of how often various events occur in the
 // histogram "Download.Counts".
 enum DownloadCountTypes {
-  // The download was initiated by navigating to a URL (e.g. by user
-  // click).
-  // This is now unused, but left around so that the values don't change.
-  INITIATED_BY_NAVIGATION_COUNT = 0,
+  // Stale enum values left around so that values passed to UMA don't
+  // change.
+  DOWNLOAD_COUNT_UNUSED_0 = 0,
+  DOWNLOAD_COUNT_UNUSED_1,
+  DOWNLOAD_COUNT_UNUSED_2,
+  DOWNLOAD_COUNT_UNUSED_3,
+  DOWNLOAD_COUNT_UNUSED_4,
 
-  // The download was initiated by invoking a context menu within a page.
-  // This is now unused, but left around so that the values don't change.
-  INITIATED_BY_CONTEXT_MENU_COUNT,
-
-  // The download was initiated when the SavePackage system rejected
-  // a Save Page As ... by returning false from
-  // SavePackage::IsSaveableContents().
-  INITIATED_BY_SAVE_PACKAGE_FAILURE_COUNT,
-
-  // The download was initiated by a drag and drop from a drag-and-drop
-  // enabled web application.
-  INITIATED_BY_DRAG_N_DROP_COUNT,
-
-  // The download was initiated by explicit RPC from the renderer process
-  // (e.g. by Alt-click).
-  INITIATED_BY_RENDERER_COUNT,
-
-  // Downloads that made it to DownloadResourceHandler -- all of the
-  // above minus those blocked by DownloadThrottlingResourceHandler.
+  // Downloads that made it to DownloadResourceHandler
   UNTHROTTLED_COUNT,
 
   // Downloads that actually complete.
   COMPLETED_COUNT,
 
   // Downloads that are cancelled before completion (user action or error).
   CANCELLED_COUNT,
 
   // Downloads that are started. Should be equal to UNTHROTTLED_COUNT.
   START_COUNT,
@@ skipping 13 matching lines @@
   // Counts errors due to writes to BaseFiles that have been detached already.
   // This can happen when saving web pages as complete packages. It happens
   // when we get messages to append data to files that have already finished and
   // been detached, but haven't yet been removed from the list of files in
   // progress.
   APPEND_TO_DETACHED_FILE_COUNT,
 
   DOWNLOAD_COUNT_TYPES_LAST_ENTRY
 };
 
+enum DownloadSource {
+  // The download was initiated when the SavePackage system rejected
+  // a Save Page As ... by returning false from
+  // SavePackage::IsSaveableContents().
+  INITIATED_BY_SAVE_PACKAGE_ON_NON_HTML = 0,
+
+  // The download was initiated by a drag and drop from a drag-and-drop
+  // enabled web application.
+  INITIATED_BY_DRAG_N_DROP,
+
+  // The download was initiated by explicit RPC from the renderer process
+  // (e.g. by Alt-click) through the IPC ViewHostMsg_DownloadUrl.
+  INITIATED_BY_RENDERER,
+
+  // The download was initiated by a renderer or plugin process through
+  // the IPC ViewHostMsg_SaveURLAs; currently this is only used by the
+  // Pepper plugin API.
+  INITIATED_BY_PEPPER_SAVE,
+
+  DOWNLOAD_SOURCE_LAST_ENTRY
+};
+
+
 // Increment one of the above counts.
-CONTENT_EXPORT void RecordDownloadCount(DownloadCountTypes type);
+void RecordDownloadCount(DownloadCountTypes type);
+
+// Record initiation of a download from a specific source.
+void RecordDownloadSource(DownloadSource source);
 
 // Record COMPLETED_COUNT and how long the download took.
 void RecordDownloadCompleted(const base::TimeTicks& start, int64 download_len);
 
 // Record INTERRUPTED_COUNT, |reason|, |received| and |total| bytes.
 void RecordDownloadInterrupted(InterruptReason reason,
                                int64 received,
                                int64 total);
 
 // Records the mime type of the download.
@@ skipping 26 matching lines @@
 
 // Record the number of downloads removed by ClearAll.
 void RecordClearAllSize(int size);
 
 // Record the number of completed unopened downloads when a download is opened.
 void RecordOpensOutstanding(int size);
 
 }  // namespace download_stats
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_STATS_H_