Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/autocomplete/autocomplete_edit.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 "chrome/browser/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 539 matching lines @@
       // The user is using a non-substituting keyword or is explicitly in
       // keyword mode.
 
       // Special case for extension keywords. Don't increment usage count for
       // these.
       if (template_url->IsExtensionKeyword()) {
         AutocompleteMatch current_match;
         GetInfoForCurrentText(&current_match, NULL);
 
         const AutocompleteMatch& match =
-            index == AutocompletePopupModel::kNoMatch ?
+            (index == AutocompletePopupModel::kNoMatch) ?
                 current_match : result().match_at(index);
 
         // Strip the keyword + leading space off the input.
         size_t prefix_length = match.template_url->keyword().length() + 1;
         ExtensionOmniboxEventRouter::OnInputEntered(profile_,
             template_url->GetExtensionId(),
             UTF16ToUTF8(match.fill_into_edit.substr(prefix_length)));
         view_->RevertAll();
         return;
       }
 
       content::RecordAction(UserMetricsAction("AcceptedKeyword"));
-      TemplateURLService* template_url_service =
-          TemplateURLServiceFactory::GetForProfile(profile_);
-      if (template_url_service)
-        template_url_service->IncrementUsageCount(template_url);
+      TemplateURLServiceFactory::GetForProfile(profile_)->IncrementUsageCount(
+          template_url);
     } else {
       DCHECK_EQ(content::PAGE_TRANSITION_GENERATED, match.transition);
       // NOTE: We purposefully don't increment the usage count of the default
       // search engine here like we do for explicit keywords above; see comments
       // in template_url.h.
     }
 
     // NOTE: Non-prepopulated engines will all have ID 0, which is fine as
     // the prepopulate IDs start at 1.  Distribution-specific engines will
     // all have IDs above the maximum, and will be automatically lumped
@@ skipping 549 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }