Split browsing data masks between content and embedder

chrome/browser/ssl/chrome_ssl_host_state_delegate_test.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.
 
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/simple_test_clock.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/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
@@ skipping 584 matching lines @@
 
 // Tests to make sure that if the user deletes their browser history, SSL
 // exceptions will be deleted as well.
 class RemoveBrowsingHistorySSLHostStateDelegateTest
     : public ChromeSSLHostStateDelegateTest {
  public:
   void RemoveAndWait(Profile* profile) {
     BrowsingDataRemover* remover =
         BrowsingDataRemoverFactory::GetForBrowserContext(profile);
     BrowsingDataRemoverCompletionObserver completion_observer(remover);
-    remover->RemoveAndReply(browsing_data::CalculateBeginDeleteTime(
-                                browsing_data::TimePeriod::LAST_HOUR),
-                            browsing_data::CalculateEndDeleteTime(
-                                browsing_data::TimePeriod::LAST_HOUR),
-                            BrowsingDataRemover::REMOVE_HISTORY,
-                            BrowsingDataHelper::UNPROTECTED_WEB,
-                            &completion_observer);
+    remover->RemoveAndReply(
+        browsing_data::CalculateBeginDeleteTime(
+            browsing_data::TimePeriod::LAST_HOUR),
+        browsing_data::CalculateEndDeleteTime(
+            browsing_data::TimePeriod::LAST_HOUR),
+        ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY,
+        ChromeBrowsingDataRemoverDelegate::ORIGIN_TYPE_UNPROTECTED_WEB,
+        &completion_observer);
     completion_observer.BlockUntilCompletion();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(RemoveBrowsingHistorySSLHostStateDelegateTest,
                        DeleteHistory) {
   scoped_refptr<net::X509Certificate> cert = GetOkCert();
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
@@ skipping 60 matching lines @@
   EXPECT_EQ(
       content::SSLHostStateDelegate::ALLOWED,
       state->QueryPolicy("localhost", *cert,
                          net::CERT_STATUS_COMMON_NAME_INVALID, &unused_value));
 
   EXPECT_EQ(
       content::SSLHostStateDelegate::ALLOWED,
       state->QueryPolicy("127.0.0.1", *cert,
                          net::CERT_STATUS_COMMON_NAME_INVALID, &unused_value));
 }