Expose getSearchTerms to tab_model for Android

chrome/browser/ui/search/search.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/ui/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/string_split.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 174 matching lines @@
   return search_terms;
 }
 
 string16 GetSearchTerms(const content::WebContents* contents) {
   if (!contents)
     return string16();
 
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   if (!IsQueryExtractionEnabled(profile))
     return string16();
-
+#if !defined(OS_IOS) && !defined(OS_ANDROID)

[Ted C, 2013/03/01 02:50:21]

Should we add a comment that IOS and Android do not support instant and that is
why we skip this check?  Or is that just implied knowledge?

[Yusuf, 2013/03/01 18:58:20]

Added comment.

On 2013/03/01 02:50:21, Ted C wrote:

   // For security reasons, don't extract search terms if the page is not being
   // rendered in the privileged Instant renderer process. This is to protect
   // against a malicious page somehow scripting the search results page and
   // faking search terms in the URL. Random pages can't get into the Instant
   // renderer and scripting doesn't work cross-process, so if the page is in
   // the Instant process, we know it isn't being exploited.
   const content::RenderProcessHost* process_host =
       contents->GetRenderProcessHost();
   if (!process_host)
     return string16();
 
   const InstantService* instant_service =
       InstantServiceFactory::GetForProfile(profile);
   if (!instant_service)
     return string16();
 
   if (!instant_service->IsInstantProcess(process_host->GetID()))
     return string16();
-
+#endif

[dhollowa, 2013/03/01 00:35:51]

nit:  // !defined(OS_IOS) && !defined(OS_ANDROID)

[Yusuf, 2013/03/01 18:58:20]

Done.

   // Check to see if search terms have already been extracted.
   const content::NavigationEntry* entry =
       contents->GetController().GetVisibleEntry();
   if (!entry)
     return string16();
 
   string16 search_terms = GetSearchTermsFromNavigationEntry(entry);
   if (!search_terms.empty())
     return search_terms;
 
@@ skipping 140 matching lines @@
 // Given a FieldTrialFlags object, returns the boolean value of the provided
 // flag.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags) {
   return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
 }
 
 }  // namespace search
 }  // namespace chrome