c/b/search/search.h|cc cleanups

chrome/browser/search/search.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/search/search.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 489 matching lines @@
       kPrerenderInstantUrlOnOmniboxFocus, false, flags);
 }
 
 GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile) {
   CHECK(ShouldAssignURLToInstantRenderer(url, profile))
       << "Error granting Instant access.";
 
   if (url.SchemeIs(chrome::kChromeSearchScheme))
     return url;
 
-  GURL effective_url(url);
-
   // Replace the scheme with "chrome-search:", and clear the port, since
   // chrome-search is a scheme without port.
   url::Replacements<char> replacements;
   std::string search_scheme(chrome::kChromeSearchScheme);
   replacements.SetScheme(search_scheme.data(),
                          url::Component(0, search_scheme.length()));
   replacements.ClearPort();
 
   // If this is the URL for a server-provided NTP, replace the host with
   // "remote-ntp".
   std::string remote_ntp_host(chrome::kChromeSearchRemoteNtpHost);
   NewTabURLDetails details = NewTabURLDetails::ForProfile(profile);
   if (details.state == NEW_TAB_URL_VALID &&
       MatchesOriginAndPath(url, details.url)) {
     replacements.SetHost(remote_ntp_host.c_str(),
                          url::Component(0, remote_ntp_host.length()));
   }
 
-  effective_url = effective_url.ReplaceComponents(replacements);
-  return effective_url;
+  return url.ReplaceComponents(replacements);
 }
 
 bool HandleNewTabURLRewrite(GURL* url,
                             content::BrowserContext* browser_context) {
   if (!IsInstantExtendedAPIEnabled())
     return false;
 
   if (!url->SchemeIs(content::kChromeUIScheme) ||
       url->host() != chrome::kChromeUINewTabHost)
     return false;
@@ skipping 57 matching lines @@
       kUseAltInstantURL, false, flags);
 }
 
 bool ShouldUseSearchPathForInstant() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kUseSearchPathForInstant, false, flags);
 }
 
 }  // namespace search