Add a source to the result of PermissionContextBase::GetPermissionStatus

chrome/browser/permissions/permission_context_base_unittest.cc

Index: chrome/browser/permissions/permission_context_base_unittest.cc
diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc
index 44e469cda75c612cfbfcea0cccd529cef6a2633c..b1960929209e39f12064d14d00c72383f99affba 100644
--- a/chrome/browser/permissions/permission_context_base_unittest.cc
+++ b/chrome/browser/permissions/permission_context_base_unittest.cc
@@ -355,7 +355,10 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
       ASSERT_EQ(1u, permission_context.decisions().size());
       EXPECT_EQ(expected, permission_context.decisions()[0]);
       EXPECT_TRUE(permission_context.tab_context_updated());
-      EXPECT_EQ(expected, permission_context.GetPermissionStatus(url, url));
+      PermissionResult result =
+          permission_context.GetPermissionStatus(url, url);
+      EXPECT_EQ(expected, result.content_setting);
+      EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
     }
 
     TestPermissionContext permission_context(profile(), permission_type,
@@ -374,8 +377,9 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
-    EXPECT_EQ(CONTENT_SETTING_BLOCK,
-              permission_context.GetPermissionStatus(url, url));
+    PermissionResult result = permission_context.GetPermissionStatus(url, url);
+    EXPECT_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
+    EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
   }
 
   void TestBlockOnSeveralDismissals_TestContent() {
@@ -490,7 +494,10 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
       EXPECT_EQ(1u, permission_context.decisions().size());
       ASSERT_EQ(expected, permission_context.decisions()[0]);
       EXPECT_TRUE(permission_context.tab_context_updated());
-      EXPECT_EQ(expected, permission_context.GetPermissionStatus(url, url));
+      PermissionResult result =
+          permission_context.GetPermissionStatus(url, url);
+      EXPECT_EQ(expected, result.content_setting);
+      EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
 
       histograms.ExpectTotalCount(
           "Permissions.Prompt.Dismissed.PriorDismissCount.MidiSysEx", i + 1);
@@ -502,8 +509,10 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     TestPermissionContext permission_context(
         profile(), content::PermissionType::MIDI_SYSEX,
         CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
-    EXPECT_EQ(CONTENT_SETTING_BLOCK,
-              permission_context.GetPermissionStatus(url, url));
+    PermissionResult result = permission_context.GetPermissionStatus(url, url);
+    EXPECT_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
+    EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
+
     variations::testing::ClearAllVariationParams();
   }
 
@@ -669,12 +678,14 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
         web_contents(), id, url, true /* user_gesture */,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
-    EXPECT_EQ(expected_permission_status,
-              permission_context.GetPermissionStatus(url, url));
+    PermissionResult result = permission_context.GetPermissionStatus(url, url);
+    EXPECT_EQ(expected_permission_status, result.content_setting);
 
     if (expected_permission_status == CONTENT_SETTING_ALLOW) {

[kcarattini, 2017/02/07 22:53:33]

Are you not planning to set a source if the content setting is ALLOW?

[raymes, 2017/02/08 04:08:40]

Eventually it will be USER_DECISION (or something), but for now it will just be
UNSPECIFIED.

       ASSERT_EQ(1u, permission_context.decisions().size());
       EXPECT_EQ(expected_permission_status, permission_context.decisions()[0]);
+    } else {
+      EXPECT_EQ(PermissionStatusSource::SAFE_BROWSING_BLACKLIST, result.source);
     }
   }