Update strings for history description in CBD

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
index c13ec712c3144717e77c1288741c2f441caf70a1..21fc3c600ddf16885e0b65e3b8f46ab05aaf762d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.history.HistoryProvider.BrowsingHistoryObserver;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.widget.DateDividedAdapter;
@@ -44,6 +45,7 @@ public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistor
             "https://support.google.com/chrome/?p=sync_history&hl="
                     + Locale.getDefault().toString();
     private static final String GOOGLE_HISTORY_LINK = "history.google.com";
+    private static final String MY_ACTIVITY_LINK = "myactivity.google.com";
 
     private final SelectionDelegate<HistoryItem> mSelectionDelegate;
     private final HistoryProvider mHistoryProvider;
@@ -334,8 +336,12 @@ public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistor
 
         mOtherFormsOfBrowsingHistoryTextView = (TextView) v.findViewById(
                 R.id.other_forms_of_browsing_history);
-        setPrivacyDisclaimerText(mOtherFormsOfBrowsingHistoryTextView,
-                R.string.android_history_other_forms_of_history, GOOGLE_HISTORY_LINK);
+        boolean flagEnabled = ChromeFeatureList.isEnabled(ChromeFeatureList.TABS_IN_CBD);

[Yaron, 2017/05/24 14:18:43]

is native guaranteed to be loaded at this point? I think probably yes but want
to make sure you've considered it

[dullweber, 2017/05/24 14:54:52]

Thanks for pointing at this, I don't know how the initialization of the native
library exactly works but I think it should be initialized:

HistoryAdapter is created in the constructor of HistoryManager. The
HistoryManager constructor calls historyAdapter.initialize(), which makes a call
to BrowsingHistoryBridge::queryHistory, which calls nativeQueryHistory().
That should mean that native calls are possible when HistoryAdapter is created,
right? 

Other than that, the HistoryActivity, which creates the HistoryManager should
only be created when a user selects history from the menu, so that is definitely
late enough?

[Yaron, 2017/05/24 15:27:06]

yep.
not always true. if the activity is in recents and chrome gets killed while in
the background this could be an issue when user comes back to chrome. But
looking at HistortyActivity, if you follow the hierarchy, it looks to do
synchronous init in onCreate so this is ok. 

+        int disclaimerTextId = flagEnabled ? R.string.android_history_other_forms_of_history_new
+                                           : R.string.android_history_other_forms_of_history;
+        String disclaimerUrl = flagEnabled ? MY_ACTIVITY_LINK : GOOGLE_HISTORY_LINK;
+        setPrivacyDisclaimerText(
+                mOtherFormsOfBrowsingHistoryTextView, disclaimerTextId, disclaimerUrl);
         MarginResizer.createWithViewAdapter(mOtherFormsOfBrowsingHistoryTextView,
                 mHistoryManager.getSelectableListLayout().getUiConfig(),
                 getDefaultTextMargin(resources),