chrome/browser/browsing_data/browsing_data_helper_unittest.cc - Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Unified Diff: chrome/browser/browsing_data/browsing_data_helper_unittest.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/browsing_data/browsing_data_file_system_helper.cc ('k') | chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/browsing_data_helper_unittest.cc

diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc

index 8ce88677bed91670c2c084b8b6e3598b66c6f513..67df9c0d2c073c26d624d6ab6bb7606966cb9793 100644

--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc

+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc

@@ -117,44 +117,48 @@ TEST_F(BrowsingDataHelperTest, TestMatches) {

// Protect kOrigin1.

mock_policy->AddProtected(kOrigin1.GetOrigin());

- EXPECT_FALSE(Match(kOrigin1, kUnprotected, mock_policy));

- EXPECT_TRUE(Match(kOrigin2, kUnprotected, mock_policy));

- EXPECT_FALSE(Match(kOriginExt, kUnprotected, mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kUnprotected, mock_policy));

- EXPECT_TRUE(Match(kOrigin1, kProtected, mock_policy));

- EXPECT_FALSE(Match(kOrigin2, kProtected, mock_policy));

- EXPECT_FALSE(Match(kOriginExt, kProtected, mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kProtected, mock_policy));

- EXPECT_FALSE(Match(kOrigin1, kExtension, mock_policy));

- EXPECT_FALSE(Match(kOrigin2, kExtension, mock_policy));

- EXPECT_TRUE(Match(kOriginExt, kExtension, mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kExtension, mock_policy));

- EXPECT_TRUE(Match(kOrigin1, kUnprotected | kProtected, mock_policy));

- EXPECT_TRUE(Match(kOrigin2, kUnprotected | kProtected, mock_policy));

- EXPECT_FALSE(Match(kOriginExt, kUnprotected | kProtected, mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kUnprotected | kProtected, mock_policy));

- EXPECT_FALSE(Match(kOrigin1, kUnprotected | kExtension, mock_policy));

- EXPECT_TRUE(Match(kOrigin2, kUnprotected | kExtension, mock_policy));

- EXPECT_TRUE(Match(kOriginExt, kUnprotected | kExtension, mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kUnprotected | kExtension, mock_policy));

- EXPECT_TRUE(Match(kOrigin1, kProtected | kExtension, mock_policy));

- EXPECT_FALSE(Match(kOrigin2, kProtected | kExtension, mock_policy));

- EXPECT_TRUE(Match(kOriginExt, kProtected | kExtension, mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kProtected | kExtension, mock_policy));

- EXPECT_TRUE(Match(kOrigin1, kUnprotected | kProtected | kExtension,

- mock_policy));

- EXPECT_TRUE(Match(kOrigin2, kUnprotected | kProtected | kExtension,

- mock_policy));

- EXPECT_TRUE(Match(kOriginExt, kUnprotected | kProtected | kExtension,

- mock_policy));

- EXPECT_FALSE(Match(kOriginDevTools, kUnprotected | kProtected | kExtension,

- mock_policy));

+ EXPECT_FALSE(Match(kOrigin1, kUnprotected, mock_policy.get()));

+ EXPECT_TRUE(Match(kOrigin2, kUnprotected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginExt, kUnprotected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginDevTools, kUnprotected, mock_policy.get()));

+ EXPECT_TRUE(Match(kOrigin1, kProtected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOrigin2, kProtected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginExt, kProtected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginDevTools, kProtected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOrigin1, kExtension, mock_policy.get()));

+ EXPECT_FALSE(Match(kOrigin2, kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(kOriginExt, kExtension, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginDevTools, kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(kOrigin1, kUnprotected | kProtected, mock_policy.get()));

+ EXPECT_TRUE(Match(kOrigin2, kUnprotected | kProtected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginExt, kUnprotected | kProtected, mock_policy.get()));

+ EXPECT_FALSE(

+ Match(kOriginDevTools, kUnprotected | kProtected, mock_policy.get()));

+ EXPECT_FALSE(Match(kOrigin1, kUnprotected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(kOrigin2, kUnprotected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(kOriginExt, kUnprotected | kExtension, mock_policy.get()));

+ EXPECT_FALSE(

+ Match(kOriginDevTools, kUnprotected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(kOrigin1, kProtected | kExtension, mock_policy.get()));

+ EXPECT_FALSE(Match(kOrigin2, kProtected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(kOriginExt, kProtected | kExtension, mock_policy.get()));

+ EXPECT_FALSE(

+ Match(kOriginDevTools, kProtected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(

+ kOrigin1, kUnprotected | kProtected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(

+ kOrigin2, kUnprotected | kProtected | kExtension, mock_policy.get()));

+ EXPECT_TRUE(Match(

+ kOriginExt, kUnprotected | kProtected | kExtension, mock_policy.get()));

+ EXPECT_FALSE(Match(kOriginDevTools,

+ kUnprotected | kProtected | kExtension,

+ mock_policy.get()));

}

} // namespace