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

chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 662 matching lines @@
     NotifyObservers();
 }
 
 TemplateURL* TemplateURLService::GetDefaultSearchProvider() {
   if (loaded_ && !load_failed_)
     return default_search_provider_;
   // We're not loaded, rely on the default search provider stored in prefs.
   return initial_default_search_provider_.get();
 }
 
+bool TemplateURLService::IsSearchResultsPageFromDefaultSearchProvider(
+    const GURL current_url) {
+  TemplateURL* default_provider = GetDefaultSearchProvider();
+  if (default_provider && default_provider->IsSearchURL(current_url))

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

Nit: Simpler:

  return default_provider && default_provider->IsSearchURL(current_url);

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

Done.

+    return true;
+  return false;
+}
+
 TemplateURL* TemplateURLService::FindNewDefaultSearchProvider() {
   // See if the prepopulated default still exists.
   scoped_ptr<TemplateURL> prepopulated_default(
       TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(profile_));
   for (TemplateURLVector::iterator i = template_urls_.begin();
        i != template_urls_.end(); ++i) {
     if ((*i)->prepopulate_id() == prepopulated_default->prepopulate_id())
       return *i;
   }
   // If not, use the first non-extension keyword of the templates that supports
@@ skipping 1886 matching lines @@
     const ExtensionKeyword& extension_keyword) const {
   TemplateURLData data;
   data.short_name = UTF8ToUTF16(extension_keyword.extension_name);
   data.SetKeyword(UTF8ToUTF16(extension_keyword.extension_keyword));
   // This URL is not actually used for navigation. It holds the extension's
   // ID, as well as forcing the TemplateURL to be treated as a search keyword.
   data.SetURL(std::string(extensions::kExtensionScheme) + "://" +
       extension_keyword.extension_id + "/?q={searchTerms}");
   return new TemplateURL(profile_, data);
 }