Add ability to set RLZ statically for OS_ANDROID

chrome/browser/search_engines/template_url.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/search_engines/template_url.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 78 matching lines @@
 }
 
 TemplateURLRef::~TemplateURLRef() {
 }
 
 std::string TemplateURLRef::GetURL() const {
   switch (type_) {
     case SEARCH:  return owner_->url();
     case SUGGEST: return owner_->suggestions_url();
     case INSTANT: return owner_->instant_url();
-    default:      NOTREACHED(); return std::string();
+    default:

[Peter Kasting, 2012/05/15 17:34:16]

Nit: Don't touch this please

[Isaac (away), 2012/05/15 19:44:41]

it was giving me a presubmit warning for two commands on a single line -- can I
ignore it and still submit through CQ?

+      NOTREACHED();
+      return std::string();
   }
 }
 
 bool TemplateURLRef::SupportsReplacement() const {
   UIThreadSearchTermsData search_terms_data(owner_->profile());
   return SupportsReplacementUsingTermsData(search_terms_data);
 }
 
 bool TemplateURLRef::SupportsReplacementUsingTermsData(
     const SearchTermsData& search_terms_data) const {
@@ skipping 96 matching lines @@
         if (accepted_suggestion >= 0)
           url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) +
                                "&");
         break;
 
       case GOOGLE_RLZ: {
         // On platforms that don't have RLZ, we still want this branch
         // to happen so that we replace the RLZ template with the
         // empty string.  (If we don't handle this case, we hit a
         // NOTREACHED below.)
-#if defined(ENABLE_RLZ)
+#if defined(ENABLE_RLZ) || defined(OS_ANDROID)
         string16 rlz_string = search_terms_data.GetRlzParameterValue();
         if (!rlz_string.empty()) {
           url.insert(i->index, "rlz=" + UTF16ToUTF8(rlz_string) + "&");
         }
 #endif
         break;
       }
 
       case GOOGLE_SEARCH_FIELDTRIAL_GROUP:
         if (AutocompleteFieldTrial::InSuggestFieldTrial()) {
@@ skipping 435 matching lines @@
       data_.SetKeyword(TemplateURLService::GenerateKeyword(url));
   }
 }
 
 void TemplateURL::InvalidateCachedValues() {
   url_ref_.InvalidateCachedValues();
   suggestions_url_ref_.InvalidateCachedValues();
   instant_url_ref_.InvalidateCachedValues();
   ResetKeywordIfNecessary(false);
 }