Roll dom_distiller_js and add UMA for word count for distilled pages.

components/dom_distiller/core/distiller_page.cc

 // Copyright 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.
 
 #include "components/dom_distiller/core/distiller_page.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 66 matching lines @@
       new dom_distiller::proto::DomDistillerResult());
   bool found_content;
   if (value->IsType(base::Value::TYPE_NULL)) {
     found_content = false;
   } else {
     found_content =
         dom_distiller::proto::json::DomDistillerResult::ReadFromValue(
             value, distiller_result.get());
     if (!found_content) {
       DVLOG(1) << "Unable to parse DomDistillerResult.";
-    } else if (distiller_result->has_timing_info()) {
-      const dom_distiller::proto::TimingInfo& timing =
-          distiller_result->timing_info();
-      if (timing.has_markup_parsing_time()) {
-        UMA_HISTOGRAM_TIMES(
-            "DomDistiller.Time.MarkupParsing",
-            base::TimeDelta::FromMillisecondsD(timing.markup_parsing_time()));
+    } else {
+      if (distiller_result->has_timing_info()) {
+        const dom_distiller::proto::TimingInfo& timing =
+            distiller_result->timing_info();
+        if (timing.has_markup_parsing_time()) {
+          UMA_HISTOGRAM_TIMES(
+              "DomDistiller.Time.MarkupParsing",
+              base::TimeDelta::FromMillisecondsD(timing.markup_parsing_time()));
+        }
+        if (timing.has_document_construction_time()) {
+          UMA_HISTOGRAM_TIMES(
+              "DomDistiller.Time.DocumentConstruction",
+              base::TimeDelta::FromMillisecondsD(
+                  timing.document_construction_time()));
+        }
+        if (timing.has_article_processing_time()) {
+          UMA_HISTOGRAM_TIMES(
+              "DomDistiller.Time.ArticleProcessing",
+              base::TimeDelta::FromMillisecondsD(
+                  timing.article_processing_time()));
+        }
+        if (timing.has_formatting_time()) {
+          UMA_HISTOGRAM_TIMES(
+              "DomDistiller.Time.Formatting",
+              base::TimeDelta::FromMillisecondsD(timing.formatting_time()));
+        }
+        if (timing.has_total_time()) {
+          UMA_HISTOGRAM_TIMES(
+              "DomDistiller.Time.DistillationTotal",
+              base::TimeDelta::FromMillisecondsD(timing.total_time()));
+        }
       }
-      if (timing.has_document_construction_time()) {
-        UMA_HISTOGRAM_TIMES(
-            "DomDistiller.Time.DocumentConstruction",
-            base::TimeDelta::FromMillisecondsD(
-                timing.document_construction_time()));
-      }
-      if (timing.has_article_processing_time()) {
-        UMA_HISTOGRAM_TIMES(
-            "DomDistiller.Time.ArticleProcessing",
-            base::TimeDelta::FromMillisecondsD(
-                timing.article_processing_time()));
-      }
-      if (timing.has_formatting_time()) {
-        UMA_HISTOGRAM_TIMES(
-            "DomDistiller.Time.Formatting",
-            base::TimeDelta::FromMillisecondsD(timing.formatting_time()));
-      }
-      if (timing.has_total_time()) {
-        UMA_HISTOGRAM_TIMES(
-            "DomDistiller.Time.DistillationTotal",
-            base::TimeDelta::FromMillisecondsD(timing.total_time()));
+      if (distiller_result->has_statistics_info()) {
+        const dom_distiller::proto::StatisticsInfo& statistics =
+            distiller_result->statistics_info();
+        if (statistics.has_word_count()) {
+          UMA_HISTOGRAM_CUSTOM_COUNTS(
+            "DomDistiller.Statistics.WordCount",
+            statistics.word_count(),
+            1, 4000, 50);
+        }
       }
     }
   }
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(distiller_page_callback_,
                  base::Passed(&distiller_result),
                  found_content));
 }
 
 }  // namespace dom_distiller