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

chrome/browser/search/search.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_SEARCH_H_
 #define CHROME_BROWSER_SEARCH_SEARCH_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 18 matching lines @@
 
 namespace search {
 
 // For reporting Cacheable NTP navigations.
 enum CacheableNTPLoad {
   CACHEABLE_NTP_LOAD_FAILED = 0,
   CACHEABLE_NTP_LOAD_SUCCEEDED = 1,
   CACHEABLE_NTP_LOAD_MAX = 2
 };
 
-enum OptInState {
-  // The user has not manually opted in/out of InstantExtended.
-  INSTANT_EXTENDED_NOT_SET,
-  // The user has opted-in to InstantExtended.
-  INSTANT_EXTENDED_OPT_IN,
-  // The user has opted-out of InstantExtended.
-  INSTANT_EXTENDED_OPT_OUT,
-  INSTANT_EXTENDED_OPT_IN_STATE_ENUM_COUNT,
-};
-
 // Returns whether the suggest is enabled for the given |profile|.
 bool IsSuggestPrefEnabled(Profile* profile);
 
 // Extracts and returns search terms from |url|. Does not consider
 // IsQueryExtractionEnabled() and Instant support state of the page and does
 // not check for a privileged process, so most callers should use
 // GetSearchTerms() below instead.
 base::string16 ExtractSearchTermsFromURL(Profile* profile, const GURL& url);
 
 // Returns true if it is okay to extract search terms from |url|. |url| must
@@ skipping 68 matching lines @@
 // Returns the default search engine base page URL to prefetch search results.
 // Returns an empty URL if 'prefetch_results' flag is set to false in field
 // trials.
 GURL GetSearchResultPrefetchBaseURL(Profile* profile);
 
 // Returns true if 'prerender_instant_url_on_omnibox_focus' flag is enabled in
 // field trials to prerender Instant search base page when the omnibox is
 // focused.
 bool ShouldPrerenderInstantUrlOnOmniboxFocus();
 
-// Transforms the input |url| into its "effective URL". The returned URL
-// facilitates grouping process-per-site. The |url| is transformed, for
-// example, from
+// Transforms the input |url| into its "effective URL". |url| must be an
+// Instant URL, i.e. ShouldAssignURLToInstantRenderer must return true. The
+// returned URL facilitates grouping process-per-site. The |url| is transformed,
+// for example, from
 //
 //   https://www.google.com/search?espv=1&q=tractors
 //
 // to the privileged URL
 //
 //   chrome-search://www.google.com/search?espv=1&q=tractors
 //
 // Notice the scheme change.
 //
 // If the input is already a privileged URL then that same URL is returned.
 //
-// If |url| is that of the online NTP, its host is replaced with "online-ntp".
+// If |url| is that of the online NTP, its host is replaced with "remote-ntp".
 // This forces the NTP and search results pages to have different SiteIntances,
 // and hence different processes.
 GURL GetEffectiveURLForInstant(const GURL& url, Profile* profile);
 
-// Rewrites |url| if
-//   1. |url| is kChromeUINewTabURL,
+// Rewrites |url| to the actual NTP URL to use if
+//   1. |url| is "chrome://newtab",
 //   2. InstantExtended is enabled, and
-//   3. The --instant-new-tab-url switch is set to a valid URL.
-// |url| is rewritten to the value of --instant-new-tab-url.
+//   3. |browser_context| doesn't correspond to an incognito profile.
 bool HandleNewTabURLRewrite(GURL* url,
                             content::BrowserContext* browser_context);
 // Reverses the operation from HandleNewTabURLRewrite.
 bool HandleNewTabURLReverseRewrite(GURL* url,
                                    content::BrowserContext* browser_context);
 
 // Sets the Instant support |state| in the navigation |entry|.
 void SetInstantSupportStateInNavigationEntry(InstantSupportState state,
                                              content::NavigationEntry* entry);
 
@@ skipping 19 matching lines @@
 
 // Returns true if 'use_search_path_for_instant' flag is set to true in field
 // trials to use an '/search' path in an alternate Instant search base page URL
 // for prefetching search results. This allows experimentation of Instant
 // search.
 bool ShouldUseSearchPathForInstant();
 
 }  // namespace search
 
 #endif  // CHROME_BROWSER_SEARCH_SEARCH_H_