Moves TabNavigation into components/sessions and renames

chrome/browser/ui/search/instant_controller.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/ui/search/instant_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/search/instant_overlay.h"
 #include "chrome/browser/ui/search/instant_tab.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "net/base/escape.h"
 #include "third_party/icu/public/common/unicode/normalizer2.h"
 
@@ skipping 143 matching lines @@
     return;
 
   const content::NavigationEntry* active_entry = controller->GetActiveEntry();
   content::NavigationEntry* transient = controller->CreateNavigationEntry(
       active_entry->GetURL(),
       active_entry->GetReferrer(),
       active_entry->GetTransitionType(),
       false,
       std::string(),
       contents->GetBrowserContext());
-  transient->SetExtraData(chrome::kInstantExtendedSearchTermsKey, search_terms);
+  transient->SetExtraData(components::kSearchTermsKey, search_terms);
   controller->SetTransientEntry(transient);
 
   SearchTabHelper::FromWebContents(contents)->NavigationEntryUpdated();
 }
 
 bool GetURLForMostVisitedItemID(Profile* profile,
                                 InstantRestrictedID most_visited_item_id,
                                 GURL* url) {
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
@@ skipping 1475 matching lines @@
     return false;
 
   // If this is not window startup, switch.
   // TODO(shishir): This is not completely reliable. Find a better way to detect
   // startup time.
   if (browser_->GetActiveWebContents())
     return true;
 
   return chrome::IsAggressiveLocalNTPFallbackEnabled();
 }