OLD | NEW |
---|---|
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
6 | 6 |
7 #include "base/guid.h" | 7 #include "base/guid.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1375 // Expect the prefs to be cleared when cookies are removed. | 1375 // Expect the prefs to be cleared when cookies are removed. |
1376 EXPECT_TRUE(prefs->GetString(omnibox::kZeroSuggestCachedResults).empty()); | 1376 EXPECT_TRUE(prefs->GetString(omnibox::kZeroSuggestCachedResults).empty()); |
1377 EXPECT_EQ(content::BrowsingDataRemover::DATA_TYPE_COOKIES, GetRemovalMask()); | 1377 EXPECT_EQ(content::BrowsingDataRemover::DATA_TYPE_COOKIES, GetRemovalMask()); |
1378 EXPECT_EQ(content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, | 1378 EXPECT_EQ(content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, |
1379 GetOriginTypeMask()); | 1379 GetOriginTypeMask()); |
1380 } | 1380 } |
1381 | 1381 |
1382 #if defined(OS_CHROMEOS) | 1382 #if defined(OS_CHROMEOS) |
1383 TEST_F(ChromeBrowsingDataRemoverDelegateTest, | 1383 TEST_F(ChromeBrowsingDataRemoverDelegateTest, |
1384 ContentProtectionPlatformKeysRemoval) { | 1384 ContentProtectionPlatformKeysRemoval) { |
1385 chromeos::ScopedTestDeviceSettingsService test_device_settings_service; | |
1386 chromeos::ScopedTestCrosSettings test_cros_settings; | |
stevenjb
2017/05/24 20:08:52
Are these changes related? Can they be separated?
Alexander Alekseev
2017/05/25 00:30:05
ChromeOS preferences are now tied to CrosSettings
| |
1387 chromeos::MockUserManager* mock_user_manager = | 1385 chromeos::MockUserManager* mock_user_manager = |
1388 new testing::NiceMock<chromeos::MockUserManager>(); | 1386 new testing::NiceMock<chromeos::MockUserManager>(); |
1389 mock_user_manager->SetActiveUser( | 1387 mock_user_manager->SetActiveUser( |
1390 AccountId::FromUserEmail("test@example.com")); | 1388 AccountId::FromUserEmail("test@example.com")); |
1391 chromeos::ScopedUserManagerEnabler user_manager_enabler(mock_user_manager); | 1389 chromeos::ScopedUserManagerEnabler user_manager_enabler(mock_user_manager); |
1392 | 1390 |
1393 std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = | 1391 std::unique_ptr<chromeos::DBusThreadManagerSetter> dbus_setter = |
1394 chromeos::DBusThreadManager::GetSetterForTesting(); | 1392 chromeos::DBusThreadManager::GetSetterForTesting(); |
1395 chromeos::MockCryptohomeClient* cryptohome_client = | 1393 chromeos::MockCryptohomeClient* cryptohome_client = |
1396 new chromeos::MockCryptohomeClient; | 1394 new chromeos::MockCryptohomeClient; |
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2335 base::Callback<bool(const GURL&)> origin_filter; | 2333 base::Callback<bool(const GURL&)> origin_filter; |
2336 tester.GetMockInfo(&remove_count, &data_type_mask, &origin_filter); | 2334 tester.GetMockInfo(&remove_count, &data_type_mask, &origin_filter); |
2337 | 2335 |
2338 EXPECT_EQ(1, remove_count); | 2336 EXPECT_EQ(1, remove_count); |
2339 EXPECT_EQ(net::ReportingBrowsingDataRemover::DATA_TYPE_REPORTS | | 2337 EXPECT_EQ(net::ReportingBrowsingDataRemover::DATA_TYPE_REPORTS | |
2340 net::ReportingBrowsingDataRemover::DATA_TYPE_CLIENTS, | 2338 net::ReportingBrowsingDataRemover::DATA_TYPE_CLIENTS, |
2341 data_type_mask); | 2339 data_type_mask); |
2342 EXPECT_TRUE( | 2340 EXPECT_TRUE( |
2343 ProbablySameFilters(builder->BuildGeneralFilter(), origin_filter)); | 2341 ProbablySameFilters(builder->BuildGeneralFilter(), origin_filter)); |
2344 } | 2342 } |
OLD | NEW |