Isolate initiation counts for downloads to their own histograms and improve

content/browser/tab_contents/tab_contents.cc

 // 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.
 
 #include "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 1083 matching lines @@
          contents_mime_type_ == "text/xml" ||
          contents_mime_type_ == "application/xhtml+xml" ||
          contents_mime_type_ == "text/plain" ||
          contents_mime_type_ == "text/css" ||
          net::IsSupportedJavascriptMimeType(contents_mime_type_.c_str());
 }
 
 void TabContents::OnSavePage() {
   // If we can not save the page, try to download it.
   if (!IsSavable()) {
+    download_stats::RecordDownloadSource(
+        download_stats::INITIATED_BY_SAVE_PACKAGE_ON_NON_HTML);
     SaveURL(GetURL(), GURL(), true);
-    download_stats::RecordDownloadCount(
-        download_stats::INITIATED_BY_SAVE_PACKAGE_FAILURE_COUNT);
     return;
   }
 
   Stop();
 
   // Create the save package and possibly prompt the user for the name to save
   // the page as. The user prompt is an asynchronous operation that runs on
   // another thread.
   save_package_ = new SavePackage(this);
   save_package_->GetSaveInfo();
@@ skipping 457 matching lines @@
 
 void TabContents::OnUpdateZoomLimits(int minimum_percent,
                                      int maximum_percent,
                                      bool remember) {
   minimum_zoom_percent_ = minimum_percent;
   maximum_zoom_percent_ = maximum_percent;
   temporary_zoom_settings_ = !remember;
 }
 
 void TabContents::OnSaveURL(const GURL& url) {
+  download_stats::RecordDownloadSource(
+      download_stats::INITIATED_BY_PEPPER_SAVE);
   // Check if the URL to save matches the URL of the main frame. Since this
   // message originates from Pepper plugins, it may not be the case if the
   // plugin is an embedded element.
   GURL main_frame_url = GetURL();
   if (!main_frame_url.is_valid())
     return;
   bool is_main_frame = (url == main_frame_url);
   SaveURL(url, main_frame_url, is_main_frame);
 }
 
@@ skipping 877 matching lines @@
                    save_info,
                    this);
 }
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }