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

chrome/browser/metrics/variations/variations_http_header_provider.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/metrics/variations/variations_http_header_provider.h"
 
 #include "base/base64.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 20 matching lines @@
   // Note the criteria for attaching Chrome experiment headers:
   // 1. We only transmit to *.google.<TLD> domains. NOTE that this use of
   //    google_util helpers to check this does not guarantee that the URL is
   //    Google-owned, only that it is of the form *.google.<TLD>. In the future
   //    we may choose to reinforce this check.
   // 2. Only transmit for non-Incognito profiles.
   // 3. For the X-Chrome-UMA-Enabled bit, only set it if UMA is in fact enabled
   //    for this install of Chrome.
   // 4. For the X-Chrome-Variations, only include non-empty variation IDs.
   if (incognito ||
-      !google_util::IsGoogleDomainUrl(url.spec(),
-                                      google_util::ALLOW_SUBDOMAIN,
+      !google_util::IsGoogleDomainUrl(url, google_util::ALLOW_SUBDOMAIN,
                                       google_util::ALLOW_NON_STANDARD_PORTS)) {
     return;
   }
 
   if (uma_enabled)
     headers->SetHeaderIfMissing("X-Chrome-UMA-Enabled", "1");
 
   // Lazily initialize the header, if not already done, before attempting to
   // transmit it.
   InitVariationIDsCacheIfNeeded();
@@ skipping 98 matching lines @@
     // if IDs are added as the header is recreated. The receiving servers are OK
     // with such descrepancies.
     variation_ids_header_ = hashed;
   } else {
     NOTREACHED() << "Failed to base64 encode Variation IDs value: "
                  << serialized;
   }
 }
 
 }  // namespace chrome_variations