Merge "Add use counters for the experimental Budget API methods"

third_party/WebKit/Source/core/frame/UseCounter.h

 /*
  * Copyright (C) 2012 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1602 matching lines @@
     kUnitlessZeroAngleGradient = 2008,
     kUnitlessZeroAngleOffsetRotate = 2009,
     kUnitlessZeroAngleTransform = 2010,
     kHTMLOListElementStartGetterReversedWithoutStartAttribute = 2011,
     kCredentialManagerPreventSilentAccess = 2012,
     kNetInfoEffectiveType = 2013,
     kTableRowDirectionDifferentFromTable = 2015,
     kTableSectionDirectionDifferentFromTable = 2016,
     // The above items are available in M60 branch.
 
+    kBudgetAPIGetCost = 2021,
+    kBudgetAPIGetBudget = 2022,
+    // The above items were merged to the M60 branch.
+
     // Add new features immediately above this line. Don't change assigned
     // numbers of any item, and don't reuse removed slots.
     // Also, run update_use_counter_feature_enum.py in
     // chromium/src/tools/metrics/histograms/ to update the UMA mapping.
     kNumberOfFeatures,  // This enum value must be last.
   };
 
   // An interface to observe UseCounter changes. Note that this is never
   // notified when the counter is disabled by |m_muteCount| or when |m_context|
   // is kDisabledContext.
@@ skipping 96 matching lines @@
     // Tracks what features/properties need to be reported to the legacy
     // histograms.
     BitVector feature_bits_;
     BitVector css_bits_;
   } legacy_counter_;
 };
 
 }  // namespace blink
 
 #endif  // UseCounter_h