Split browsing data masks between content and embedder

chrome/browser/net/sdch_browsertest.cc

 // Copyright 2014 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.
 
 // End-to-end SDCH tests.  Uses the embedded test server to return SDCH
 // results
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
 #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h"
+#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 367 matching lines @@
   }
 
   void BrowsingDataRemoveAndWait(int remove_mask) {
     BrowsingDataRemover* remover =
         BrowsingDataRemoverFactory::GetForBrowserContext(browser()->profile());
     BrowsingDataRemoverCompletionObserver completion_observer(remover);
     remover->RemoveAndReply(browsing_data::CalculateBeginDeleteTime(
                                 browsing_data::TimePeriod::LAST_HOUR),
                             browsing_data::CalculateEndDeleteTime(
                                 browsing_data::TimePeriod::LAST_HOUR),
-                            remove_mask, BrowsingDataHelper::UNPROTECTED_WEB,
+                            remove_mask,
+                            BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB,
                             &completion_observer);
     completion_observer.BlockUntilCompletion();
   }
 
   // Something of a cheat; nuke the dictionaries off the SdchManager without
   // touching the cache (which browsing data remover would do).
   void NukeSdchDictionaries() {
     base::RunLoop run_loop;
     content::BrowserThread::PostTaskAndReply(
         content::BrowserThread::IO, FROM_HERE,
@@ skipping 242 matching lines @@
 const char SdchBrowserTest::kTestHost[] = "our.test.host.com";
 
 // Confirm that after getting a dictionary, calling the browsing
 // data remover renders it unusable.  Also (in calling
 // ForceSdchDictionaryLoad()) servers as a smoke test for SDCH.
 IN_PROC_BROWSER_TEST_F(SdchBrowserTest, BrowsingDataRemover) {
   ASSERT_TRUE(ForceSdchDictionaryLoad(browser()));
 
   // Confirm browsing data remover without removing the cache leaves
   // SDCH alone.
-  BrowsingDataRemoveAndWait(BrowsingDataRemover::REMOVE_ALL &
-                            ~BrowsingDataRemover::REMOVE_CACHE);
+  BrowsingDataRemoveAndWait(ChromeBrowsingDataRemoverDelegate::ALL_DATA_TYPES &
+                            ~BrowsingDataRemover::DATA_TYPE_CACHE);
   bool sdch_encoding_used = false;
   ASSERT_TRUE(GetData(&sdch_encoding_used));
   EXPECT_TRUE(sdch_encoding_used);
 
   // Confirm browsing data remover removing the cache clears SDCH state.
-  BrowsingDataRemoveAndWait(BrowsingDataRemover::REMOVE_CACHE);
+  BrowsingDataRemoveAndWait(BrowsingDataRemover::DATA_TYPE_CACHE);
   sdch_encoding_used = false;
   ASSERT_TRUE(GetData(&sdch_encoding_used));
   EXPECT_FALSE(sdch_encoding_used);
 }
 
 // Confirm dictionaries not visible in other profiles.
 IN_PROC_BROWSER_TEST_F(SdchBrowserTest, Isolation) {
   ASSERT_TRUE(ForceSdchDictionaryLoad(browser()));
   ASSERT_TRUE(SetupSecondBrowser());
   ASSERT_TRUE(SetupIncognitoBrowser());
@@ skipping 17 matching lines @@
   ASSERT_TRUE(SetupIncognitoBrowser());
   ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser()));
 
   // Data fetches on main browser should not be SDCH encoded.
   bool sdch_encoding_used = true;
   ASSERT_TRUE(GetData(&sdch_encoding_used));
   EXPECT_FALSE(sdch_encoding_used);
 }
 
 }  // namespace