Moves TabNavigation into components/sessions and renames

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 "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "components/sessions/serialized_navigation_entry.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 namespace chrome {
 
 namespace {
 
 // The default value we should assign to the instant_extended.enabled pref. As
@@ skipping 191 matching lines @@
                                             kDisableStartMargin);
 
   if (url.SchemeIsSecure() && template_url->HasSearchTermsReplacementKey(url))
     template_url->ExtractSearchTermsFromURL(url, &search_terms);
 
   return search_terms;
 }
 
 }  // namespace
 
-const char kInstantExtendedSearchTermsKey[] = "search_terms";
-
 // Negative start-margin values prevent the "es_sm" parameter from being used.
 const int kDisableStartMargin = -1;
 
 bool IsInstantExtendedAPIEnabled() {
 #if defined(OS_IOS) || defined(OS_ANDROID)
   return false;
 #else
   // On desktop, query extraction is part of Instant extended, so if one is
   // enabled, the other is too.
   return IsQueryExtractionEnabled() || IsLocalOnlyInstantExtendedAPIEnabled();
@@ skipping 51 matching lines @@
           &flags, NULL)) {
     return GetBoolValueForFlagWithDefault(kLocalOnlyFlagName, false, flags);
   }
   return false;
 }
 
 string16 GetSearchTermsFromNavigationEntry(
     const content::NavigationEntry* entry) {
   string16 search_terms;
   if (entry)
-    entry->GetExtraData(kInstantExtendedSearchTermsKey, &search_terms);
+    entry->GetExtraData(sessions::kSearchTermsKey, &search_terms);
   return search_terms;
 }
 
 string16 GetSearchTerms(const content::WebContents* contents) {
   if (!contents)
     return string16();
 
   const content::NavigationEntry* entry =
       contents->GetController().GetVisibleEntry();
   if (!entry)
@@ skipping 292 matching lines @@
   replacements.SetHostStr(search_host);
   replacements.SetPortStr(search_port);
   return instant_url.ReplaceComponents(replacements);
 }
 
 bool MatchesOriginAndPath(const GURL& my_url, const GURL& other_url) {
   return MatchesOrigin(my_url, other_url) && my_url.path() == other_url.path();
 }
 
 }  // namespace chrome