Index: chrome/browser/search_engines/template_url.cc |
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc |
index 43ca5902aded0ad2620646e63fe0402f6e9f8795..f5c7d215d77c00afdda6e2f54c4c132a005151ee 100644 |
--- a/chrome/browser/search_engines/template_url.cc |
+++ b/chrome/browser/search_engines/template_url.cc |
@@ -96,7 +96,9 @@ std::string TemplateURLRef::GetURL() const { |
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 comma
|
+ NOTREACHED(); |
+ return std::string(); |
} |
} |
@@ -213,7 +215,7 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData( |
// 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) + "&"); |