Add Android-specific parameters to search_engines/

chrome/browser/search_engines/search_terms_data_android.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_engines/search_terms_data_android.h"
+
+#include "chrome/browser/search_engines/search_terms_data.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;

[Peter Kasting, 2012/12/06 07:02:37]

Nit: Don't use using directives unless they save a significant number of lines.

[gone, 2012/12/06 20:59:49]

Done.

+
+base::LazyInstance<string16>::Leaky
+    SearchTermsDataAndroid::rlz_parameter_value_ = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<std::string>::Leaky
+    SearchTermsDataAndroid::search_client_ = LAZY_INSTANCE_INITIALIZER;
+
+string16 SearchTermsDataAndroid::GetRlzParameterValue() {
+  return rlz_parameter_value_.Get();
+}
+
+void SearchTermsDataAndroid::SetRlzParameterValue(const string16& rlz) {
+  rlz_parameter_value_.Get() = rlz;
+}
+
+std::string SearchTermsDataAndroid::GetSearchClient() {
+  return search_client_.Get();
+}
+
+void SearchTermsDataAndroid::SetSearchClient(const std::string& client) {
+  search_client_.Get() = client;
+}
+
+string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));

[Peter Kasting, 2012/12/06 07:02:37]

Nit: Indent 4, not even (2 places)

[gone, 2012/12/06 20:59:49]

Funky.  I copied these directly from search_terms_data.cc.  I'll fix those, too.

+  // Android doesn't use the rlz library.  Instead, it manages the rlz string
+  // on its own.
+  return SearchTermsDataAndroid::GetRlzParameterValue();

[Peter Kasting, 2012/12/06 07:02:37]

I suggest returning the value directly here and below.

You could do this by making the strings globals, so anyone could just set them
directly, and you can read them directly here.  I'd probably do this.  It's
extremely simple.

If you like, you can stick them in a namespace or (otherwise empty) struct or
something, for name scoping.  But I don't think the getter and setter buy
anything but one more indirection.

[gone, 2012/12/06 20:59:49]

Kept them inside an otherwise empty struct to keep it tidier, but removed the
setters and getters as requested.

+}
+
+std::string UIThreadSearchTermsData::GetSearchClient() const {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return SearchTermsDataAndroid::GetSearchClient();
+}