Introduce DATA_TYPE_DOM_STORAGE for DOM-Accessible storage

chrome/browser/chrome_content_browser_client_unittest.cc

 // Copyright 2013 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/chrome_content_browser_client.h"
 
 #include <list>
 #include <map>
 #include <memory>
 
@@ skipping 374 matching lines @@
     bool cookies;
     bool storage;
     bool cache;
     int mask;
   } test_cases[] = {
       {false, false, false, 0},
       {true, false, false,
        BrowsingDataRemover::DATA_TYPE_COOKIES |
            BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
            ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA},
-      {false, true, false,
-       ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA &
-           ~BrowsingDataRemover::DATA_TYPE_COOKIES &
-           ~BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS &
-           ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA},
+      {false, true, false, BrowsingDataRemover::DATA_TYPE_DOM_STORAGE},
       {false, false, true, BrowsingDataRemover::DATA_TYPE_CACHE},
       {true, true, false,
-       ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA},
+       BrowsingDataRemover::DATA_TYPE_COOKIES |
+           BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+           ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA |
+           BrowsingDataRemover::DATA_TYPE_DOM_STORAGE},
       {true, false, true,
        BrowsingDataRemover::DATA_TYPE_COOKIES |
            BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
            ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA |
            BrowsingDataRemover::DATA_TYPE_CACHE},
       {false, true, true,
-       BrowsingDataRemover::DATA_TYPE_CACHE |
-           (ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA &
-            ~BrowsingDataRemover::DATA_TYPE_COOKIES &
-            ~BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS &
-            ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA)},
+       BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
+           BrowsingDataRemover::DATA_TYPE_CACHE},
       {true, true, true,
-       ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA |
+       BrowsingDataRemover::DATA_TYPE_COOKIES |
+           BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+           ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA |
+           BrowsingDataRemover::DATA_TYPE_DOM_STORAGE |
            BrowsingDataRemover::DATA_TYPE_CACHE},
   };
 
   for (unsigned int i = 0; i < arraysize(test_cases); ++i) {
     SCOPED_TRACE(base::StringPrintf("Test case %d", i));
     const TestCase& test_case = test_cases[i];
 
     // We always delete data for all time and all origin types.
     int all_origin_types = ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES;
 
@@ skipping 156 matching lines @@
   client.ClearSiteData(
       profile(), origin, true /* cookies */, false /* storage */,
       true /* cache */,
       base::Bind(
           &ChromeContentBrowserClientClearSiteDataTest::SetClearingFinished,
           base::Unretained(this), true));
   EXPECT_TRUE(IsClearingFinished());
 }
 
 }  // namespace