Add a way to send the resource percentage signal to the RC.

chrome/browser/page_load_metrics/observers/resource_tracking_page_load_metrics_observer.cc

 // Copyright 2017 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/page_load_metrics/observers/resource_tracking_page_load_metrics_observer.h"
 
+#include "components/offline_pages/core/background/request_coordinator.h"
+#include "components/offline_pages/core/background/resource_data_type.h"
+#include "content/public/common/resource_type.h"

[RyanSturm, 2017/05/10 18:30:13]

resource_type.h is included in the header already.

[Pete Williamson, 2017/05/10 19:00:52]

OK removed (My original thinking was that I shouldn't be relying on other
headers for things that I need).

+
+namespace {
+offline_pages::ResourceDataType ConvertResourceTypeToResourceDataType(

[RyanSturm, 2017/05/10 18:30:13]

nit: A short method comment here would be good.

[Pete Williamson, 2017/05/10 19:00:52]

Done.

+    content::ResourceType type) {
+  switch (type) {
+    case (content::RESOURCE_TYPE_MAIN_FRAME):
+      return offline_pages::ResourceDataType::TEXT_HTML;
+    case (content::RESOURCE_TYPE_SUB_FRAME):
+      return offline_pages::ResourceDataType::TEXT_HTML;
+    case (content::RESOURCE_TYPE_STYLESHEET):
+      return offline_pages::ResourceDataType::TEXT_CSS;
+    case (content::RESOURCE_TYPE_SCRIPT):
+      return offline_pages::ResourceDataType::TEXT_SCRIPT;
+    case (content::RESOURCE_TYPE_IMAGE):
+      return offline_pages::ResourceDataType::IMAGE;
+    case (content::RESOURCE_TYPE_FONT_RESOURCE):
+      return offline_pages::ResourceDataType::OTHER;

[RyanSturm, 2017/05/10 18:30:13]

Can you group these by return value? e.g.:

case (content::RESOURCE_TYPE_MAIN_FRAME):
case (content::RESOURCE_TYPE_SUB_FRAME):
  return offline_pages::ResourceDataType::TEXT_HTML;
case (content::RESOURCE_TYPE_STYLESHEET):
  return offline_pages::ResourceDataType::TEXT_CSS;
case (content::RESOURCE_TYPE_FONT_RESOURCE):
case (content::RESOURCE_TYPE_OBJECT):
  return offline_pages::ResourceDataType::OTHER;

[Pete Williamson, 2017/05/10 19:00:52]

Done.

+    case (content::RESOURCE_TYPE_SUB_RESOURCE):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_OBJECT):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_MEDIA):
+      return offline_pages::ResourceDataType::MEDIA;
+    case (content::RESOURCE_TYPE_WORKER):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_SHARED_WORKER):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_PREFETCH):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_FAVICON):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_XHR):
+      return offline_pages::ResourceDataType::XHR;
+    case (content::RESOURCE_TYPE_PING):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_SERVICE_WORKER):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_CSP_REPORT):
+      return offline_pages::ResourceDataType::OTHER;
+    case (content::RESOURCE_TYPE_PLUGIN_RESOURCE):
+      return offline_pages::ResourceDataType::OTHER;
+    default:
+      return offline_pages::ResourceDataType::OTHER;
+  }
+}
+}  // namespace
+
 namespace page_load_metrics {
 
 ResourceTrackingPageLoadMetricsObserver::
-    ResourceTrackingPageLoadMetricsObserver()
-    : started_count_(0), completed_count_(0) {}
+    ResourceTrackingPageLoadMetricsObserver(
+        offline_pages::ResourceTrackerObserver* request_coordinator)
+    : started_count_(0),
+      completed_count_(0),
+      request_coordinator_(request_coordinator) {}
 ResourceTrackingPageLoadMetricsObserver::
     ~ResourceTrackingPageLoadMetricsObserver() {}
 
 void ResourceTrackingPageLoadMetricsObserver::OnStartedResource(
     const ExtraRequestStartInfo& extra_request_start_info) {
-  // TODO(petewiL): Store this by type.
-  ++started_count_;
+  DVLOG(0) << "@@@@@@ type " << extra_request_start_info.resource_type << " "

[RyanSturm, 2017/05/10 18:30:13]

Is this log statement needed here?

[Pete Williamson, 2017/05/10 19:00:52]

Oops, I forgot to remove these.  Gone now.

+           << __func__;
+  // TODO(petewiL): Store this by type. Until we do, only look at images.
+  if (extra_request_start_info.resource_type == content::RESOURCE_TYPE_IMAGE) {
+    ++started_count_;
+    InformObservers(content::ResourceType::RESOURCE_TYPE_IMAGE, started_count_,
+                    completed_count_);
+  }
 }
 
 void ResourceTrackingPageLoadMetricsObserver::OnLoadedResource(
     const ExtraRequestCompleteInfo& extra_request_complete_info) {
   // TODO(petewil): Check to see if the type of the request changed.  If it did,
   // update the old and new types for the started type.  Then update by type for
-  // the completed type.
-  ++completed_count_;
+  // the completed type.  Maybe we can just skip that, and count XHR as its own
+  // type.
+  DVLOG(0) << "@@@@@@ type " << extra_request_complete_info.resource_type << " "

[RyanSturm, 2017/05/10 18:30:13]

is this log needed? same below

[Pete Williamson, 2017/05/10 19:00:52]

Done.

+           << __func__;
+  if (extra_request_complete_info.resource_type ==
+      content::RESOURCE_TYPE_IMAGE) {
+    DVLOG(0) << "@@@@@@ incremeting completed count " << __func__;
+    ++completed_count_;
+    InformObservers(content::ResourceType::RESOURCE_TYPE_IMAGE, started_count_,
+                    completed_count_);
+  }
 }
 
 void ResourceTrackingPageLoadMetricsObserver::GetCountsForTypeForTesting(
     const content::ResourceType type,
     int64_t* started_count,
     int64_t* completed_count) {
   if (started_count != nullptr)
     *started_count = started_count_;
   if (completed_count != nullptr)
     *completed_count = completed_count_;
 }
 
+void ResourceTrackingPageLoadMetricsObserver::InformObservers(
+    const content::ResourceType type,
+    int64_t started_count,
+    int64_t completed_count) {
+  if (request_coordinator_) {
+    offline_pages::ResourceDataType converted_type =
+        ConvertResourceTypeToResourceDataType(type);
+    request_coordinator_->ObserveResourceTracking(converted_type, started_count,
+                                                  completed_count);
+  }
+}
+
 }  // namespace page_load_metrics