Add integration of the new heuristics

components/dom_distiller/core/distillable_page_detector.cc

 // 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.
 
 #include "components/dom_distiller/core/distillable_page_detector.h"
 
 #include "base/logging.h"
+#include "grit/components_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace dom_distiller {
 
+const DistillablePageDetector* DistillablePageDetector::GetDefault() {
+  static DistillablePageDetector* detector = nullptr;
+  if (!detector) {
+    std::string serialized_proto =
+        ResourceBundle::GetSharedInstance()
+            .GetRawDataResource(IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL)
+            .as_string();
+    scoped_ptr<AdaBoostProto> proto(new AdaBoostProto);
+    CHECK(proto->ParseFromString(serialized_proto));
+    detector = new DistillablePageDetector(proto.Pass());
+  }
+  return detector;
+}
+
 DistillablePageDetector::DistillablePageDetector(
     scoped_ptr<AdaBoostProto> proto)
     : proto_(proto.Pass()), threshold_(0.0) {
   CHECK(proto_->num_stumps() == proto_->stump_size());
   for (int i = 0; i < proto_->num_stumps(); ++i) {
     const StumpProto& stump = proto_->stump(i);
     CHECK(stump.feature_number() < proto_->num_features());
     threshold_ += stump.weight() / 2.0;
   }
 }
 
 DistillablePageDetector::~DistillablePageDetector() {
 }
 
 bool DistillablePageDetector::Classify(
     const std::vector<double>& features) const {
   return Score(features) > threshold_;
 }
 
 double DistillablePageDetector::Score(
     const std::vector<double>& features) const {
-  CHECK(features.size() == size_t(proto_->num_features()));
+  if (features.size() != size_t(proto_->num_features())) {

[nyquist, 2015/04/01 18:12:20]

I would be OK with moving this to your previous CL and add a sanity-check style
unit test for it too. Or update the unit-test for it in this CL maybe?

[cjhopman, 2015/04/01 20:59:29]

Done.

+    return 0.0;
+  }
   double score = 0.0;
   for (int i = 0; i < proto_->num_stumps(); ++i) {
     const StumpProto& stump = proto_->stump(i);
     if (features[stump.feature_number()] > stump.split()) {
       score += stump.weight();
     }
   }
   return score;
 }
 
 double DistillablePageDetector::GetThreshold() const {
   return threshold_;
 }
 
 }  // namespace dom_distiller