Improve activity log ad metrics

chrome/browser/extensions/activity_log/activity_actions.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
     ACTION_API_CALL = 0,
     ACTION_API_EVENT = 1,
     UNUSED_ACTION_API_BLOCKED = 2,  // Not in use, but reserved for future.
     ACTION_CONTENT_SCRIPT = 3,
     ACTION_DOM_ACCESS = 4,
     ACTION_DOM_EVENT = 5,
     ACTION_WEB_REQUEST = 6,
     ACTION_ANY = 1001,              // Used for lookups of unspecified type.
   };
 
-  // The type of ad injection an action performed.
+  // The type of ad injection an action performed. Do not delete or reorder
+  // these metrics, as they are used in histogramming.
   enum InjectionType {
     // No ad injection occurred.
     NO_AD_INJECTION = 0,
     // A new ad was injected.
     INJECTION_NEW_AD,
     // An ad was removed.
     INJECTION_REMOVED_AD,
     // An ad was replaced.
     INJECTION_REPLACED_AD,
     // Something occurred which heuristically looks like an ad injection, but we
     // didn't categorize it as such (likely because we didn't recognize it as
     // an ad network). If our list is effective, this should be significantly
     // lower than the non-LIKELY counterparts.
     INJECTION_LIKELY_NEW_AD,
     INJECTION_LIKELY_REPLACED_AD,
 
     // Place any new injection types above this entry.
     NUM_INJECTION_TYPES
   };
 
+  // The type of ad which was injected.
+  enum AdType {
+    AD_TYPE_NONE,
+    AD_TYPE_IFRAME,
+    AD_TYPE_EMBED,
+    AD_TYPE_ANCHOR,
+
+    // Place any new injection types above this entry.
+    NUM_AD_TYPES
+  };
+
   // A useful shorthand for methods that take or return collections of Action
   // objects.
   typedef std::vector<scoped_refptr<Action> > ActionVector;
 
   // Creates a new activity log Action object.  The extension_id and type
   // fields are immutable.  All other fields can be filled in with the
   // accessors/mutators below.
   Action(const std::string& extension_id,
          const base::Time& time,
          const ActionType action_type,
@@ skipping 80 matching lines @@
 
   // Print an action as a regular string for debugging purposes.
   virtual std::string PrintForDebug() const;
 
  protected:
   virtual ~Action();
 
  private:
   friend class base::RefCountedThreadSafe<Action>;
 
+  // Returns true if a given |url| could be an ad.
+  bool UrlCouldBeAd(const GURL& url) const;
+
   // Uploads the URL to RAPPOR (preserving privacy) if this might have been an
   // ad injection.
   void MaybeUploadUrl(rappor::RapporService* rappor_service) const;
 
-  // Checks an action with the appendChild API for ad injection.
-  InjectionType CheckAppendChild() const;
   // Checks an action that modified the src of an element for ad injection.
   InjectionType CheckSrcModification() const;
+  // Checks an action with the appendChild API for ad injection.
+  // |ad_type_out| is populated with the type of ad which was injected, if there
+  // was an injection.
+  InjectionType CheckAppendChild(AdType* ad_type_out) const;
+  // Checks a DOM object (e.g. an appended child) for ad injection.
+  // |ad_type_out| is populated with the type of ad which was injected, if there
+  // was an injection.
+  InjectionType CheckDomObject(const base::DictionaryValue* object,
+                               AdType* ad_type_out) const;
 
   std::string extension_id_;
   base::Time time_;
   ActionType action_type_;
   std::string api_name_;
   scoped_ptr<base::ListValue> args_;
   GURL page_url_;
   std::string page_title_;
   bool page_incognito_;
   GURL arg_url_;
@@ skipping 18 matching lines @@
 // comparisons.
 struct ActionComparatorExcludingTimeAndActionId {
   // Evaluates the comparison lhs < rhs.
   bool operator()(const scoped_refptr<Action>& lhs,
                   const scoped_refptr<Action>& rhs) const;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_ACTIONS_H_