Replace --google-base-suggest-url and --instant-url with --google-base-url.

chrome/browser/google/google_search_counter.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/google/google_search_counter.h"
 
 #include "base/logging.h"
 #include "chrome/browser/google/google_util.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
 namespace {
 
 // Returns true iff |entry| represents a Google search from the Omnibox.
 // This method assumes that we have already verified that |entry|'s URL is a
 // Google search URL.
 bool IsOmniboxGoogleSearchNavigation(const content::NavigationEntry& entry) {
   const content::PageTransition stripped_transition =
       PageTransitionStripQualifier(entry.GetTransitionType());
-  DCHECK(google_util::IsGoogleSearchUrl(entry.GetURL().spec()));
+  DCHECK(google_util::IsGoogleSearchUrl(entry.GetURL()));
   return stripped_transition == content::PAGE_TRANSITION_GENERATED;
 }
 
 // Returns true iff |entry| represents a Google search from the Google Search
 // App. This method assumes that we have already verified that |entry|'s URL is
 // a Google search URL.
 bool IsSearchAppGoogleSearchNavigation(const content::NavigationEntry& entry) {
-  DCHECK(google_util::IsGoogleSearchUrl(entry.GetURL().spec()));
+  DCHECK(google_util::IsGoogleSearchUrl(entry.GetURL()));
   return entry.GetURL().query().find("source=search_app") !=
          std::string::npos;
 }
 
 }  // namespace
 
 // static
 void GoogleSearchCounter::RegisterForNotifications() {
   GoogleSearchCounter::GetInstance()->RegisterForNotificationsInternal();
 }
@@ skipping 11 matching lines @@
 }
 
 void GoogleSearchCounter::ProcessCommittedEntry(
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   const content::LoadCommittedDetails* commit =
       content::Details<content::LoadCommittedDetails>(details).ptr();
   const content::NavigationEntry& entry = *commit->entry;
 
   // First see if this is a Google search URL at all.
-  if (!google_util::IsGoogleSearchUrl(entry.GetURL().spec()))
+  if (!google_util::IsGoogleSearchUrl(entry.GetURL()))
     return;
 
   // If the commit is a GENERATED commit with a Google search URL, we know it's
   // an Omnibox search.
   if (IsOmniboxGoogleSearchNavigation(entry)) {
     // Note that GoogleSearchMetrics logs metrics through UMA, which will only
     // transmit these counts to the server if the user has opted into sending
     // usage stats.
     search_metrics_->RecordGoogleSearch(GoogleSearchMetrics::AP_OMNIBOX);
   } else if (IsSearchAppGoogleSearchNavigation(entry)) {
@@ skipping 22 matching lines @@
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
       ProcessCommittedEntry(source, details);
       break;
     default:
       NOTREACHED();
   }
 }