NULL -> nullptr under athena/

athena/extensions/shell/url_search_provider.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 "athena/extensions/shell/url_search_provider.h"
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_factory.h"
 #include "athena/extensions/shell/athena_shell_scheme_classifier.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 73 matching lines @@
   virtual const AutocompleteSchemeClassifier& SchemeClassifier() override {
     return scheme_classifier_;
   }
   virtual void Classify(
       const base::string16& text,
       bool prefer_keyword,
       bool allow_exact_keyword_match,
       metrics::OmniboxEventProto::PageClassification page_classification,
       AutocompleteMatch* match,
       GURL* alternate_nav_url) override {}
-  virtual history::URLDatabase* InMemoryDatabase() override { return NULL; }
+  virtual history::URLDatabase* InMemoryDatabase() override { return nullptr; }
   virtual void DeleteMatchingURLsForKeywordFromHistory(
       history::KeywordID keyword_id,
       const base::string16& term) override {}
   virtual bool TabSyncEnabledAndUnencrypted() override { return false; }
   virtual void PrefetchImage(const GURL& url) override {}
 
  private:
   content::BrowserContext* browser_context_;
   AthenaShellSchemeClassifier scheme_classifier_;
 
@@ skipping 96 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(UrlSearchResult);
 };
 
 }  // namespace
 
 UrlSearchProvider::UrlSearchProvider(content::BrowserContext* browser_context)
     : browser_context_(browser_context),
       // TODO(mukai): introduce the real parameters when it's necessary.
       template_url_service_(new TemplateURLService(
-          NULL /* prefs */,
+          nullptr /* prefs */,
           scoped_ptr<SearchTermsData>(new AthenaSearchTermsData()),
-          NULL /* KeywordWebDataService */,
+          nullptr /* KeywordWebDataService */,
           scoped_ptr<TemplateURLServiceClient>(
               new AthenaTemplateURLServiceClient()),
-          NULL /*GoogleURLTracker */,
-          NULL /* RapporService */,
+          nullptr /*GoogleURLTracker */,
+          nullptr /* RapporService */,
           base::Closure() /* dsp_change_callback */)),
       provider_(new ::SearchProvider(
           this,
           template_url_service_.get(),
           scoped_ptr<AutocompleteProviderClient>(
               new AthenaAutocompleteProviderClient(browser_context_)))) {
   template_url_service_->Load();
 }
 
 UrlSearchProvider::~UrlSearchProvider() {
@@ skipping 13 matching lines @@
                              AthenaShellSchemeClassifier());
 
   // Clearing results here may cause unexpected results.
   // TODO(mukai): fix this by fixing crbug.com/415500
   if (!minimal_changes)
     ClearResults();
 
   if (input_.type() == metrics::OmniboxInputType::URL) {
     // TODO(hashimoto): Componentize HistoryURLProvider and remove this code.
     AutocompleteMatch what_you_typed_match(
-        NULL, 0, false, AutocompleteMatchType::URL_WHAT_YOU_TYPED);
+        nullptr, 0, false, AutocompleteMatchType::URL_WHAT_YOU_TYPED);
     what_you_typed_match.destination_url = input_.canonicalized_url();
     what_you_typed_match.contents = input_.text();
     what_you_typed_match.relevance = kScoreForWhatYouTypedResult;
     Add(scoped_ptr<app_list::SearchResult>(
         new UrlSearchResult(browser_context_, what_you_typed_match)));
   }
 
   provider_->Start(input_, minimal_changes);
 }
 
@@ skipping 10 matching lines @@
        ++it) {
     if (!it->destination_url.is_valid())
       continue;
 
     Add(scoped_ptr<app_list::SearchResult>(
         new UrlSearchResult(browser_context_, *it)));
   }
 }
 
 }  // namespace athena