Move code about browsing data from PrefServiceBridge to BrowsingDataBridge.

chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java

 // Copyright 2016 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.browsing_data;
 
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.support.test.filters.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ShortcutHelper;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge.OnClearBrowsingDataListener;
+import org.chromium.chrome.browser.preferences.privacy.BrowsingDataBridge;
+import org.chromium.chrome.browser.preferences.privacy.BrowsingDataBridge.OnClearBrowsingDataListener;
 import org.chromium.chrome.browser.webapps.TestFetchStorageCallback;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ skipping 63 matching lines @@
 
         for (final Map.Entry<String, String> app : apps.entrySet()) {
             registerWebapp(app.getKey(), app.getValue());
         }
         assertEquals(apps.keySet(), WebappRegistry.getRegisteredWebappIdsForTesting());
 
         // Clear cookies and site data excluding the registrable domain "google.com".
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                PrefServiceBridge.getInstance().clearBrowsingDataExcludingDomains(
+                BrowsingDataBridge.getInstance().clearBrowsingDataExcludingDomains(
                         new OnClearBrowsingDataListener() {
                             @Override
                             public void onBrowsingDataCleared() {
                                 mCallbackCalled = true;
                             }
                         },
                         new int[]{ BrowsingDataType.COOKIES },
                         TimePeriod.ALL_TIME,
                         new String[]{ "google.com" },
                         new int[] { 1 },
                         new String[0],
                         new int[0]);
             }
         });
         CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         // The last two webapps should have been unregistered.
         assertEquals(new HashSet<String>(Arrays.asList("webapp1")),
                 WebappRegistry.getRegisteredWebappIdsForTesting());
 
         // Clear cookies and site data with no url filter.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                PrefServiceBridge.getInstance().clearBrowsingData(
+                BrowsingDataBridge.getInstance().clearBrowsingData(
                         new OnClearBrowsingDataListener() {
                             @Override
                             public void onBrowsingDataCleared() {
                                 mCallbackCalled = true;
                             }
                         },
                         new int[]{ BrowsingDataType.COOKIES },
                         TimePeriod.ALL_TIME);
             }
         });
         CriteriaHelper.pollUiThread(new CallbackCriteria());
 
         // All webapps should have been unregistered.
         assertTrue(WebappRegistry.getRegisteredWebappIdsForTesting().isEmpty());
     }
 }