Record the data use by content type

components/data_use_measurement/core/data_use_user_data.h

 // Copyright 2015 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 COMPONENTS_DATA_USE_MEASUREMENT_CORE_DATA_USE_USER_DATA_H_
 #define COMPONENTS_DATA_USE_MEASUREMENT_CORE_DATA_USE_USER_DATA_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 34 matching lines @@
     PRECACHE,
     NTP_TILES,
     FEEDBACK_UPLOADER,
     TRACING_UPLOADER,
     DOM_DISTILLER,
     CLOUD_PRINT,
     SEARCH_PROVIDER_LOGOS,
     UPDATE_CLIENT,
   };
 
+  // Data use broken by content type. This enum must remain synchronized
+  // with the enum of the same name in metrics/histograms/histograms.xml.

[Mark P, 2016/12/22 21:40:29]

Please follow the guidelines here:
https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histo...

[Raj, 2016/12/22 23:14:37]

Done.

+  enum DataUseContentType {
+    MAIN_FRAME_HTML,
+    NON_MAIN_FRAME_HTML,
+    CSS,
+    IMAGE,
+    JAVASCRIPT,
+    FONT,
+    AUDIO_APPBACKGROUND,
+    AUDIO_TABBACKGROUND,
+    AUDIO,
+    VIDEO_APPBACKGROUND,
+    VIDEO_TABBACKGROUND,
+    VIDEO,
+    OTHER,

[Mark P, 2016/12/22 21:40:29]

Also, it's typical for people to put the unknown/other bucket first so that when
they add new elements later, it's not stuck in the middle somewhere.

[Raj, 2016/12/22 23:14:37]

Done.

+    TYPE_MAX,
+  };
+
   // The state of the application. Only available on Android and on other
   // platforms it is always FOREGROUND.
   enum AppState { UNKNOWN, BACKGROUND, FOREGROUND };
 
   DataUseUserData(ServiceName service_name, AppState app_state);
   ~DataUseUserData() override;
 
   // Helper function to create DataUseUserData. The caller takes the ownership
   // of the returned object.
   static base::SupportsUserData::Data* Create(
       DataUseUserData::ServiceName service);
 
   // Return the service name of the ServiceName enum.
   static std::string GetServiceNameAsString(ServiceName service);
 
   // Services should use this function to attach their |service_name| to the
   // URLFetcher serving them.
   static void AttachToFetcher(net::URLFetcher* fetcher,
                               ServiceName service_name);
 
   ServiceName service_name() const { return service_name_; }
 
   AppState app_state() const { return app_state_; }
 
   void set_app_state(AppState app_state) { app_state_ = app_state; }
 
+  DataUseContentType content_type() { return content_type_; }
+
+  void set_content_type(DataUseContentType content_type) {
+    content_type_ = content_type;
+  }
+
   // The key for retrieving back this type of user data.
   static const void* const kUserDataKey;
 
  private:
   const ServiceName service_name_;
 
   // App state when network access was performed for the request previously.
   AppState app_state_;
 
+  DataUseContentType content_type_;
+
   DISALLOW_COPY_AND_ASSIGN(DataUseUserData);
 };
 
 }  // namespace data_use_measurement
 
 #endif  // COMPONENTS_DATA_USE_MEASUREMENT_CORE_DATA_USE_USER_DATA_H_