BASELINE: Update Chromium to 51.0.2704.41

Also adds in all smaller components by reversing logic for exclusion.

Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

2 files changed, 8 insertions, 1 deletions

diff --git a/chromium/net/filter/filter.cc b/chromium/net/filter/filter.cc
index 466aa109fd7..502ce5bb5d7 100644
--- a/chromium/net/filter/filter.cc
+++ b/chromium/net/filter/filter.cc
@@ -78,6 +78,8 @@ std::string FilterTypeAsString(Filter::FilterType type_id) {
       return "FILTER_TYPE_SDCH_POSSIBLE  ";
     case Filter::FILTER_TYPE_UNSUPPORTED:
       return "FILTER_TYPE_UNSUPPORTED";
+    case Filter::FILTER_TYPE_MAX:
+      return "FILTER_TYPE_MAX";
   }
   return "";
 }
diff --git a/chromium/net/filter/filter.h b/chromium/net/filter/filter.h
index e9df3dbc9db..31d08d4980f 100644
--- a/chromium/net/filter/filter.h
+++ b/chromium/net/filter/filter.h
@@ -151,7 +151,8 @@ class NET_EXPORT_PRIVATE Filter {
     FILTER_ERROR
   };
 
-  // Specifies type of filters that can be created.
+  // Specifies type of filters that can be created.  Do not change the values
+  // of this enum; it is preserved in a histogram.
   enum FilterType {
     FILTER_TYPE_BROTLI,
     FILTER_TYPE_DEFLATE,
@@ -160,6 +161,8 @@ class NET_EXPORT_PRIVATE Filter {
     FILTER_TYPE_SDCH,
     FILTER_TYPE_SDCH_POSSIBLE,  // Sdch possible, but pass through allowed.
     FILTER_TYPE_UNSUPPORTED,
+
+    FILTER_TYPE_MAX
   };
 
   virtual ~Filter();
@@ -233,6 +236,8 @@ class NET_EXPORT_PRIVATE Filter {
   // Returns a string describing the FilterTypes implemented by this filter.
   std::string OrderedFilterList() const;
 
+  FilterType type() const { return type_id_; }
+
  protected:
   friend class BrotliUnitTest;
   friend class GZipUnitTest;