Cheer up spell-checking code

chrome/browser/spellchecker/feedback_sender_unittest.cc

 // Copyright (c) 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.
 //
 // Unit tests for |FeedbackSender| object.
 
 #include "chrome/browser/spellchecker/feedback_sender.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 47 matching lines @@
   }
   return number_of_occurrences;
 }
 
 }  // namespace
 
 // A test fixture to help keep tests simple.
 class FeedbackSenderTest : public testing::Test {
  public:
   FeedbackSenderTest() : ui_thread_(content::BrowserThread::UI, &loop_) {
-    feedback_.reset(new FeedbackSender(NULL, kLanguage, kCountry));
+    feedback_.reset(new FeedbackSender(nullptr, kLanguage, kCountry));
     feedback_->StartFeedbackCollection();
   }
 
   ~FeedbackSenderTest() override {}
 
  protected:
   // Appends the "--enable-spelling-service-feedback" switch to the
   // command-line.
   void AppendCommandLineSwitch() {
     // The command-line switch is temporary.
     // TODO(rouslan): Remove the command-line switch. http://crbug.com/247726
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableSpellingFeedbackFieldTrial);
-    feedback_.reset(new FeedbackSender(NULL, kLanguage, kCountry));
+    feedback_.reset(new FeedbackSender(nullptr, kLanguage, kCountry));
     feedback_->StartFeedbackCollection();
   }
 
   // Enables the "SpellingServiceFeedback.Enabled" field trial.
   void EnableFieldTrial() {
     // The field trial is temporary.
     // TODO(rouslan): Remove the field trial. http://crbug.com/247726
     field_trial_list_.reset(
         new base::FieldTrialList(new metrics::SHA1EntropyProvider("foo")));
     field_trial_ = base::FieldTrialList::CreateFieldTrial(
         kFeedbackFieldTrialName, kFeedbackFieldTrialEnabledGroupName);
     field_trial_->group();
-    feedback_.reset(new FeedbackSender(NULL, kLanguage, kCountry));
+    feedback_.reset(new FeedbackSender(nullptr, kLanguage, kCountry));
     feedback_->StartFeedbackCollection();
   }
 
   uint32_t AddPendingFeedback() {
     std::vector<SpellCheckResult> results(1, BuildSpellCheckResult());
     feedback_->OnSpellcheckResults(kRendererProcessId,
                                    base::UTF8ToUTF16(kText),
                                    std::vector<SpellCheckMarker>(),
                                    &results);
     return results[0].hash;
@@ skipping 83 matching lines @@
 }
 
 // Send SELECT feedback message if the user has selected a spelling suggestion.
 TEST_F(FeedbackSenderTest, SelectFeedback) {
   uint32_t hash = AddPendingFeedback();
   static const int kSuggestionIndex = 0;
   feedback_->SelectedSuggestion(hash, kSuggestionIndex);
   feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
                                       std::vector<uint32_t>());
   EXPECT_TRUE(UploadDataContains("\"actionType\":\"SELECT\""));
-  EXPECT_TRUE(UploadDataContains("\"actionTargetIndex\":" + kSuggestionIndex));
+  EXPECT_TRUE(UploadDataContains("\"actionTargetIndex\":" +
+                                 base::StringPrintf("%d", kSuggestionIndex)));
 }
 
 // Send ADD_TO_DICT feedback message if the user has added the misspelled word
 // to the custom dictionary.
 TEST_F(FeedbackSenderTest, AddToDictFeedback) {
   uint32_t hash = AddPendingFeedback();
   feedback_->AddedToDictionary(hash);
   feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
                                       std::vector<uint32_t>());
   EXPECT_TRUE(UploadDataContains("\"actionType\":\"ADD_TO_DICT\""));
@@ skipping 205 matching lines @@
 
 // The field names and types should correspond to the API.
 TEST_F(FeedbackSenderTest, FeedbackAPI) {
   AddPendingFeedback();
   feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
                                       std::vector<uint32_t>());
   std::string actual_data = GetUploadData();
   scoped_ptr<base::DictionaryValue> actual(static_cast<base::DictionaryValue*>(
       base::JSONReader::Read(actual_data).release()));
   actual->SetString("params.key", "TestDummyKey");
-  base::ListValue* suggestions = NULL;
+  base::ListValue* suggestions = nullptr;
   actual->GetList("params.suggestionInfo", &suggestions);
-  base::DictionaryValue* suggestion = NULL;
+  base::DictionaryValue* suggestion = nullptr;
   suggestions->GetDictionary(0, &suggestion);
   suggestion->SetString("suggestionId", "42");
   suggestion->SetString("timestamp", "9001");
   static const std::string expected_data =
       "{\"apiVersion\":\"v2\","
       "\"method\":\"spelling.feedback\","
       "\"params\":"
       "{\"clientName\":\"Chrome\","
       "\"originCountry\":\"USA\","
       "\"key\":\"TestDummyKey\","
@@ skipping 198 matching lines @@
                         "the chance to work hard at work worth doing."),
       std::vector<SpellCheckMarker>(), &results);
   feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
                                       std::vector<uint32_t>());
   EXPECT_TRUE(
       UploadDataContains(",\"originalText\":\"and away teh best prize\","));
   EXPECT_TRUE(UploadDataContains(",\"misspelledStart\":9,"));
 }
 
 }  // namespace spellcheck