[InstantExtended] Fixing how PageLoadSRP is emitted. Previously it was emitted only for Instant sea…

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/format_macros.h"
@@ skipping 699 matching lines @@
     const GURL destination_url = autocomplete_controller()->
         GetDestinationURL(match, query_formulation_time);
 
     RecordPercentageMatchHistogram(
         permanent_text_, current_text,
         view_->toolbar_model()->WouldReplaceSearchURLWithSearchTerms(false),
         match.transition);
 
     // Track whether the destination URL sends us to a search results page
     // using the default search provider.
-    TemplateURL* default_provider =
+    bool is_search_results =

[Peter Kasting, 2013/07/31 23:56:51]

Nit: Not the best name; instead of trying to think of a good one, just inline
this into the conditional.

[rpetterson, 2013/08/05 19:46:12]

Done.

         TemplateURLServiceFactory::GetForProfile(profile_)->
-            GetDefaultSearchProvider();
-    if (default_provider && default_provider->IsSearchURL(destination_url))
+            IsSearchResultsPageFromDefaultSearchProvider(destination_url);
+    if (is_search_results)

[Peter Kasting, 2013/07/31 23:56:51]

Nit: While here: {}

[rpetterson, 2013/08/05 19:46:12]

Done.

       content::RecordAction(
           UserMetricsAction("OmniboxDestinationURLIsSearchOnDSP"));
 
     // This calls RevertAll again.
     base::AutoReset<bool> tmp(&in_revert_, true);
     controller_->OnAutocompleteAccept(destination_url, disposition,
                                       match.transition, alternate_nav_url);
   }
 
   if (match.starred)
@@ skipping 562 matching lines @@
     instant->OmniboxFocusChanged(state, reason, NULL);
 
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 }