Update ActivityLog detection to use previous values, hrefs.

chrome/browser/extensions/activity_log/uma_policy.cc

 // Copyright 2013 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 "chrome/browser/extensions/activity_log/uma_policy.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 23 matching lines @@
 const int kCreatedScript      = 1 << UmaPolicy::CREATED_SCRIPT;
 const int kCreatedIframe      = 1 << UmaPolicy::CREATED_IFRAME;
 const int kCreatedDiv         = 1 << UmaPolicy::CREATED_DIV;
 const int kCreatedLink        = 1 << UmaPolicy::CREATED_LINK;
 const int kCreatedInput       = 1 << UmaPolicy::CREATED_INPUT;
 const int kCreatedEmbed       = 1 << UmaPolicy::CREATED_EMBED;
 const int kCreatedObject      = 1 << UmaPolicy::CREATED_OBJECT;
 const int kAdInjected         = 1 << UmaPolicy::AD_INJECTED;
 const int kAdRemoved          = 1 << UmaPolicy::AD_REMOVED;
 const int kAdReplaced         = 1 << UmaPolicy::AD_REPLACED;
+const int kAdLikelyInjected   = 1 << UmaPolicy::AD_LIKELY_INJECTED;
+const int kAdLikelyReplaced   = 1 << UmaPolicy::AD_LIKELY_REPLACED;
 
 // A mask of all the ad injection flags.
 const int kAnyAdActivity = kAdInjected | kAdRemoved | kAdReplaced;
 
 }  // namespace
 
 // Class constants, also used in testing. --------------------------------------
 
 const char UmaPolicy::kNumberOfTabs[]       = "num_tabs";
 const size_t UmaPolicy::kMaxTabsTracked     = 50;
@@ skipping 98 matching lines @@
   switch (ad_injection) {
     case Action::INJECTION_NEW_AD:
       ret_bit |= kAdInjected;
       break;
     case Action::INJECTION_REMOVED_AD:
       ret_bit |= kAdRemoved;
       break;
     case Action::INJECTION_REPLACED_AD:
       ret_bit |= kAdReplaced;
       break;
+    case Action::INJECTION_LIKELY_NEW_AD:
+      ret_bit |= kAdLikelyInjected;
+      break;
+    case Action::INJECTION_LIKELY_REPLACED_AD:
+      ret_bit |= kAdLikelyReplaced;
+      break;
     case Action::NO_AD_INJECTION:
       break;
     case Action::NUM_INJECTION_TYPES:
       NOTREACHED();
   }
 
   return ret_bit;
 }
 
 void UmaPolicy::HistogramOnClose(const std::string& cleaned_url,
@@ skipping 54 matching lines @@
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(CREATED_EMBED),
                              statuses[CREATED_EMBED - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(CREATED_OBJECT),
                              statuses[CREATED_OBJECT - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_INJECTED),
                              statuses[AD_INJECTED - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_REMOVED),
                              statuses[AD_REMOVED - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_REPLACED),
                              statuses[AD_REPLACED - 1]);
+    UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_LIKELY_INJECTED),
+                             statuses[AD_LIKELY_INJECTED - 1]);
+    UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_LIKELY_REPLACED),
+                             statuses[AD_LIKELY_REPLACED - 1]);
   } else {
     prefix += "Google.";
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(CONTENT_SCRIPT),
                              statuses[CONTENT_SCRIPT - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(READ_DOM),
                              statuses[READ_DOM - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(MODIFIED_DOM),
                              statuses[MODIFIED_DOM - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(DOM_METHOD),
                              statuses[DOM_METHOD - 1]);
@@ skipping 14 matching lines @@
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(CREATED_EMBED),
                              statuses[CREATED_EMBED - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(CREATED_OBJECT),
                              statuses[CREATED_OBJECT - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_INJECTED),
                              statuses[AD_INJECTED - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_REMOVED),
                              statuses[AD_REMOVED - 1]);
     UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_REPLACED),
                              statuses[AD_REPLACED - 1]);
+    UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_LIKELY_INJECTED),
+                             statuses[AD_LIKELY_INJECTED - 1]);
+    UMA_HISTOGRAM_COUNTS_100(prefix + GetHistogramName(AD_LIKELY_REPLACED),
+                             statuses[AD_LIKELY_REPLACED - 1]);
   }
 }
 
 // Handle tab tracking. --------------------------------------------------------
 
 void UmaPolicy::OnBrowserAdded(Browser* browser) {
   if (!profile_->IsSameProfile(browser->profile()))
     return;
   browser->tab_strip_model()->AddObserver(this);
 }
@@ skipping 125 matching lines @@
     case CREATED_EMBED:
       return "CreatedEmbed";
     case CREATED_OBJECT:
       return "CreatedObject";
     case AD_INJECTED:
       return "AdInjected";
     case AD_REMOVED:
       return "AdRemoved";
     case AD_REPLACED:
       return "AdReplaced";
+    case AD_LIKELY_INJECTED:
+      return "AdLikelyInjected";
+    case AD_LIKELY_REPLACED:
+      return "AdLikelyReplaced";
     case NONE:
     case MAX_STATUS:
     default:
       NOTREACHED();
       return "";
   }
 }
 
 }  // namespace extensions