Misc. omnibox cleanup:

components/omnibox/browser/autocomplete_controller.cc

 // Copyright (c) 2012 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/omnibox/browser/autocomplete_controller.h"
 
 #include <stddef.h>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 157 matching lines @@
 }
 
 }  // namespace
 
 AutocompleteController::AutocompleteController(
     std::unique_ptr<AutocompleteProviderClient> provider_client,
     AutocompleteControllerDelegate* delegate,
     int provider_types)
     : delegate_(delegate),
       provider_client_(std::move(provider_client)),
-      history_url_provider_(NULL),
-      keyword_provider_(NULL),
-      search_provider_(NULL),
-      zero_suggest_provider_(NULL),
+      history_url_provider_(nullptr),
+      keyword_provider_(nullptr),
+      search_provider_(nullptr),
+      zero_suggest_provider_(nullptr),
       stop_timer_duration_(OmniboxFieldTrial::StopTimerFieldTrialDuration()),
       done_(true),
       in_start_(false),
       template_url_service_(provider_client_->GetTemplateURLService()) {
   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
     providers_.push_back(new BookmarkProvider(provider_client_.get()));
   if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
     providers_.push_back(new BuiltinProvider(provider_client_.get()));
   if (provider_types & AutocompleteProvider::TYPE_HISTORY_QUICK)
@@ skipping 209 matching lines @@
     bool force_notify_default_match_changed) {
   TRACE_EVENT0("omnibox", "AutocompleteController::UpdateResult");
   const bool last_default_was_valid = result_.default_match() != result_.end();
   // The following three variables are only set and used if
   // |last_default_was_valid|.
   base::string16 last_default_fill_into_edit, last_default_keyword,
       last_default_associated_keyword;
   if (last_default_was_valid) {
     last_default_fill_into_edit = result_.default_match()->fill_into_edit;
     last_default_keyword = result_.default_match()->keyword;
-    if (result_.default_match()->associated_keyword != NULL)
+    if (result_.default_match()->associated_keyword) {
       last_default_associated_keyword =
           result_.default_match()->associated_keyword->keyword;
+    }
   }
 
   if (regenerate_result)
     result_.Reset();
 
   AutocompleteResult last_result;
   last_result.Swap(&result_);
 
   for (Providers::const_iterator i(providers_.begin());
        i != providers_.end(); ++i)
@@ skipping 16 matching lines @@
 
   UpdateKeywordDescriptions(&result_);
   UpdateAssociatedKeywords(&result_);
   UpdateAssistedQueryStats(&result_);
   if (search_provider_)
     search_provider_->RegisterDisplayedAnswers(result_);
 
   const bool default_is_valid = result_.default_match() != result_.end();
   base::string16 default_associated_keyword;
   if (default_is_valid &&
-      (result_.default_match()->associated_keyword != NULL)) {
+      result_.default_match()->associated_keyword) {
     default_associated_keyword =
         result_.default_match()->associated_keyword->keyword;
   }
   // We've gotten async results. Send notification that the default match
   // updated if fill_into_edit, associated_keyword, or keyword differ.  (The
   // second can change if we've just started Chrome and the keyword database
   // finishes loading while processing this request.  The third can change
   // if we swapped from interpreting the input as a search--which gets
   // labeled with the default search provider's keyword--to a URL.)
   // We don't check the URL as that may change for the default match
@@ skipping 194 matching lines @@
   expire_timer_.Stop();
   stop_timer_.Stop();
   done_ = true;
   if (clear_result && !result_.empty()) {
     result_.Reset();
     // NOTE: We pass in false since we're trying to only clear the popup, not
     // touch the edit... this is all a mess and should be cleaned up :(
     NotifyChanged(false);
   }
 }