Update strings for history description in CBD

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesBasicTest.java

 // Copyright 2017 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.
 
 package org.chromium.chrome.browser.preferences.privacy;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
 
 import android.content.Context;
 import android.preference.CheckBoxPreference;
 import android.preference.PreferenceScreen;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.CollectionUtil;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
 import org.chromium.components.sync.AndroidSyncSettings;
+import org.chromium.components.sync.ModelType;
 import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Integration tests for ClearBrowsingDataPreferencesBasic.
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
         ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
 public class ClearBrowsingDataPreferencesBasicTest {
     @Rule
     public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
             new ChromeActivityTestRule<>(ChromeActivity.class);
 
     private static final String GOOGLE_ACCOUNT = "Google Account";
-    private static final String OTHER_ACTIVITY = "other activity";
+    private static final String OTHER_ACTIVITY = "other forms of browsing history";
     private static final String SIGNED_IN_DEVICES = "signed-in devices";
 
     @Before
     public void setUp() throws InterruptedException {
         SigninTestUtil.setUpAuthForTest(InstrumentationRegistry.getInstrumentation());
         mActivityTestRule.startMainActivityOnBlankPage();
     }
 
     @After
     public void tearDown() throws Exception {
         ProfileSyncService.overrideForTests(null);
     }
 
     private static class StubProfileSyncService extends ProfileSyncService {
-        StubProfileSyncService() {
+        private final boolean mSyncable;
+
+        StubProfileSyncService(boolean syncable) {
             super();
+            mSyncable = syncable;
+        }
+
+        public Set<Integer> getActiveDataTypes() {
+            if (mSyncable) {
+                return CollectionUtil.newHashSet(ModelType.HISTORY_DELETE_DIRECTIVES);
+            } else {
+                return new HashSet<Integer>();
+            }
         }
     }
 
-    private void setSyncable(boolean syncable) {
+    private void setSyncable(final boolean syncable) {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();
         delegate.setMasterSyncAutomatically(syncable);
         AndroidSyncSettings.overrideForTests(context, delegate);
         if (syncable) {
             AndroidSyncSettings.enableChromeSync(context);
         } else {
             AndroidSyncSettings.disableChromeSync(context);
         }
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                ProfileSyncService.overrideForTests(new StubProfileSyncService());
+                ProfileSyncService.overrideForTests(new StubProfileSyncService(syncable));
             }
         });
     }
 
     private String getCheckboxSummary(PreferenceScreen screen, String preference) {
         CheckBoxPreference checkbox = (CheckBoxPreference) screen.findPreference(preference);
         return new StringBuilder(checkbox.getSummary()).toString();
     }
 
     /**
@@ skipping 83 matching lines @@
                 String historySummary =
                         getCheckboxSummary(screen, ClearBrowsingDataPreferencesBasic.PREF_HISTORY);
 
                 assertThat(cookiesSummary, containsString(GOOGLE_ACCOUNT));
                 assertThat(historySummary, containsString(OTHER_ACTIVITY));
                 assertThat(historySummary, containsString(SIGNED_IN_DEVICES));
             }
         });
     }
 }