summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 12:02:43 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 12:02:43 +0000
commit4239828a6a1e20c1ba27d1535ab5fe04db692992 (patch)
tree975c77639d9dc40149476a57cd5958599289c22e /chrome/browser/sync
parentb5835cd2ca10e1d4b5c821af36e9d9dc6dca008f (diff)
downloadchromium_src-4239828a6a1e20c1ba27d1535ab5fe04db692992.zip
chromium_src-4239828a6a1e20c1ba27d1535ab5fe04db692992.tar.gz
chromium_src-4239828a6a1e20c1ba27d1535ab5fe04db692992.tar.bz2
Adding "Clear hosted app data" checkbox to browsing data removal UI.
Original patch from battre@chromium.org, I'm just sheparding it along as he's out on vacation. BUG=116372 TBR=rsimha@chromium.org, timsteele@chromium.org TEST=Install a hosted application, then clear browsing data with the new checkbox checked: the hosted application's data should be cleared. Without the checkbox, the data should remain untouched. Review URL: https://chromiumcodereview.appspot.com/10502015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 4ac1a9d..6c72862 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -322,6 +322,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, ClearData) {
ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies));
ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords));
ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteHostedAppsData));
ChangeBooleanPref(0, prefs::kDeleteBrowsingHistory);
ChangeBooleanPref(0, prefs::kDeleteDownloadHistory);
@@ -329,6 +330,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, ClearData) {
ChangeBooleanPref(0, prefs::kDeleteCookies);
ChangeBooleanPref(0, prefs::kDeletePasswords);
ChangeBooleanPref(0, prefs::kDeleteFormData);
+ ChangeBooleanPref(0, prefs::kDeleteHostedAppsData);
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
ASSERT_TRUE(BooleanPrefMatches(
prefs::kDeleteBrowsingHistory));
@@ -338,6 +340,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, ClearData) {
ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies));
ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords));
ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData));
+ ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteHostedAppsData));
}
// TCM ID - 3686300.