Replace incident type handlers with implementations of Incident.

chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc

 // Copyright 2014 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/safe_browsing/incident_reporting/preference_validation_delegate.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
+#include "chrome/browser/safe_browsing/incident_reporting/incident.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // A basic test harness that creates a delegate instance for which it stores all
 // incidents. Tests can push data to the delegate and verify that the test
 // instance was provided with the expected data.
 class PreferenceValidationDelegateTest : public testing::Test {
  protected:
-  typedef ScopedVector<safe_browsing::ClientIncidentReport_IncidentData>
-      IncidentVector;
+  typedef ScopedVector<safe_browsing::Incident> IncidentVector;
 
   PreferenceValidationDelegateTest()
       : kPrefPath_("atomic.pref"),
         null_value_(base::Value::CreateNullValue()) {}
 
   void SetUp() override {
     testing::Test::SetUp();
     invalid_keys_.push_back(std::string("one"));
     invalid_keys_.push_back(std::string("two"));
     instance_.reset(new safe_browsing::PreferenceValidationDelegate(
         base::Bind(&PreferenceValidationDelegateTest::AddIncident,
                    base::Unretained(this))));
   }
 
-  void AddIncident(
-      scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData> data) {
-    incidents_.push_back(data.release());
+  void AddIncident(scoped_ptr<safe_browsing::Incident> incident) {
+    incidents_.push_back(incident.release());
   }
 
   static void ExpectValueStatesEquate(
       PrefHashStoreTransaction::ValueState store_state,
       safe_browsing::
           ClientIncidentReport_IncidentData_TrackedPreferenceIncident_ValueState
               incident_state) {
     typedef safe_browsing::
         ClientIncidentReport_IncidentData_TrackedPreferenceIncident TPIncident;
     switch (store_state) {
@@ skipping 28 matching lines @@
   std::vector<std::string> invalid_keys_;
   scoped_ptr<TrackedPreferenceValidationDelegate> instance_;
 };
 
 // Tests that a NULL value results in an incident with no value.
 TEST_F(PreferenceValidationDelegateTest, NullValue) {
   instance_->OnAtomicPreferenceValidation(kPrefPath_,
                                           NULL,
                                           PrefHashStoreTransaction::CLEARED,
                                           TrackedPreferenceHelper::DONT_RESET);
-  safe_browsing::ClientIncidentReport_IncidentData* incident =
-      incidents_.back();
+  scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
+      incidents_.back()->TakePayload());
   EXPECT_FALSE(incident->tracked_preference().has_atomic_value());
   EXPECT_EQ(
       safe_browsing::
           ClientIncidentReport_IncidentData_TrackedPreferenceIncident::CLEARED,
       incident->tracked_preference().value_state());
 }
 
 // Tests that all supported value types can be stringified into an incident. The
 // parameters for the test are the type of value to test and the expected value
 // string.
@@ skipping 42 matching lines @@
   base::Value::Type value_type_;
   const char* expected_value_;
 };
 
 TEST_P(PreferenceValidationDelegateValues, Value) {
   instance_->OnAtomicPreferenceValidation(kPrefPath_,
                                           MakeValue(value_type_).get(),
                                           PrefHashStoreTransaction::CLEARED,
                                           TrackedPreferenceHelper::DONT_RESET);
   ASSERT_EQ(1U, incidents_.size());
-  safe_browsing::ClientIncidentReport_IncidentData* incident =
-      incidents_.back();
+  scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
+      incidents_.back()->TakePayload());
   EXPECT_EQ(std::string(expected_value_),
             incident->tracked_preference().atomic_value());
 }
 
 INSTANTIATE_TEST_CASE_P(
     Values,
     PreferenceValidationDelegateValues,
     // On Android, make_tuple(..., "null") doesn't compile due to the error:
     // testing/gtest/include/gtest/internal/gtest-tuple.h:246:48:
     //   error: array used as initializer
@@ skipping 65 matching lines @@
   }
 
   PrefHashStoreTransaction::ValueState value_state_;
   TrackedPreferenceHelper::ResetAction reset_action_;
 };
 
 TEST_P(PreferenceValidationDelegateWithIncident, Atomic) {
   instance_->OnAtomicPreferenceValidation(
       kPrefPath_, null_value_.get(), value_state_, reset_action_);
   ASSERT_EQ(1U, incidents_.size());
-  safe_browsing::ClientIncidentReport_IncidentData* incident =
-      incidents_.back();
+  scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
+      incidents_.back()->TakePayload());
   EXPECT_TRUE(incident->has_tracked_preference());
   const safe_browsing::
       ClientIncidentReport_IncidentData_TrackedPreferenceIncident& tp_incident =
           incident->tracked_preference();
   EXPECT_EQ(kPrefPath_, tp_incident.path());
   EXPECT_EQ(0, tp_incident.split_key_size());
   EXPECT_TRUE(tp_incident.has_atomic_value());
   EXPECT_EQ(std::string("null"), tp_incident.atomic_value());
   EXPECT_TRUE(tp_incident.has_value_state());
   ExpectValueStatesEquate(value_state_, tp_incident.value_state());
 }
 
 TEST_P(PreferenceValidationDelegateWithIncident, Split) {
   instance_->OnSplitPreferenceValidation(
       kPrefPath_, &dict_value_, invalid_keys_, value_state_, reset_action_);
   ASSERT_EQ(1U, incidents_.size());
-  safe_browsing::ClientIncidentReport_IncidentData* incident =
-      incidents_.back();
+  scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
+      incidents_.back()->TakePayload());
   EXPECT_TRUE(incident->has_tracked_preference());
   const safe_browsing::
       ClientIncidentReport_IncidentData_TrackedPreferenceIncident& tp_incident =
           incident->tracked_preference();
   EXPECT_EQ(kPrefPath_, tp_incident.path());
   EXPECT_FALSE(tp_incident.has_atomic_value());
   ExpectKeysEquate(invalid_keys_, tp_incident.split_key());
   EXPECT_TRUE(tp_incident.has_value_state());
   ExpectValueStatesEquate(value_state_, tp_incident.value_state());
 }
 
 INSTANTIATE_TEST_CASE_P(
     WithIncident,
     PreferenceValidationDelegateWithIncident,
     testing::Combine(
         testing::Values(PrefHashStoreTransaction::CLEARED,
                         PrefHashStoreTransaction::CHANGED,
                         PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE),
         testing::Values(TrackedPreferenceHelper::WANTED_RESET,
                         TrackedPreferenceHelper::DO_RESET)));