Add integration of the new heuristics

components/dom_distiller/core/page_features_unittest.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/page_features.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace dom_distiller {
 
 // This test uses input data of core features and the output of the training
 // pipeline's derived feature extraction to ensure that the extraction that is
 // done in Chromium matches that in the training pipeline.
 TEST(DomDistillerPageFeaturesTest, TestCalculateDerivedFeatures) {
@@ skipping 37 matching lines @@
   for (size_t i = 0; i < derived_features->GetSize(); i += 2) {
     std::string label;
     ASSERT_TRUE(derived_features->GetString(i, &label));
     labels.push_back(label);
   }
 
   for (size_t i = 0; i < input_entries->GetSize(); ++i) {
     base::DictionaryValue* core_features;
     ASSERT_TRUE(input_entries->GetDictionary(i, &entry));
     ASSERT_TRUE(entry->GetDictionary("features", &core_features));
+    // CalculateDerivedFeaturesFromJSON expects a base::Value of the stringified
+    // JSON (and not a base::Value of the JSON itself)
+    std::string stringified_json;
+    ASSERT_TRUE(base::JSONWriter::Write(core_features, &stringified_json));
+    scoped_ptr<base::Value> stringified_value(
+        new base::StringValue(stringified_json));
     std::vector<double> derived(
-        CalculateDerivedFeaturesFromJSON(core_features));
+        CalculateDerivedFeaturesFromJSON(stringified_value.get()));
 
     ASSERT_EQ(labels.size(), derived.size());
     ASSERT_TRUE(expected_output_entries->GetDictionary(i, &entry));
     ASSERT_TRUE(entry->GetList("features", &derived_features));
     std::string entry_url;
     ASSERT_TRUE(entry->GetString("url", &entry_url));
     for (size_t j = 0, value_index = 1; j < derived.size();
          ++j, value_index += 2) {
       double expected_value;
       if (!derived_features->GetDouble(value_index, &expected_value)) {
         bool bool_value;
         ASSERT_TRUE(derived_features->GetBoolean(value_index, &bool_value));
         expected_value = bool_value ? 1.0 : 0.0;
       }
       EXPECT_DOUBLE_EQ(derived[j], expected_value)
           << "incorrect value for entry with url " << entry_url
           << " for derived feature " << labels[j];
     }
   }
 }
 }