Chromium Code Reviews| 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 2225cadd21bd642e3f008af3a87dc65fa3a92dfd..8f1accefdf8fb76d97cddc9c5eba8b2280deefd6 100644 |
| --- a/chrome/browser/permissions/permission_context_base_unittest.cc |
| +++ b/chrome/browser/permissions/permission_context_base_unittest.cc |
| @@ -19,6 +19,7 @@ |
| #include "chrome/browser/permissions/permission_decision_auto_blocker.h" |
| #include "chrome/browser/permissions/permission_queue_controller.h" |
| #include "chrome/browser/permissions/permission_request_id.h" |
| +#include "chrome/browser/permissions/permission_uma_util.h" |
|
raymes
2016/08/16 03:39:29
nit: is this still needed?
dominickn
2016/08/16 04:15:42
Done.
|
| #include "chrome/browser/permissions/permission_util.h" |
| #include "chrome/common/chrome_features.h" |
| #include "chrome/common/chrome_switches.h" |
| @@ -134,10 +135,14 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness { |
| response == CONTENT_SETTING_ASK); |
| #if defined(OS_ANDROID) |
| bool update_content_setting = response != CONTENT_SETTING_ASK; |
| - bool allowed = response == CONTENT_SETTING_ALLOW; |
| + PermissionAction decision = DISMISSED; |
| + if (response == CONTENT_SETTING_ALLOW) |
| + decision = GRANTED; |
| + else if (response == CONTENT_SETTING_BLOCK) |
| + decision = DENIED; |
| context->GetInfoBarController()->OnPermissionSet( |
| id, url, url, false /* user_gesture */, update_content_setting, |
| - allowed); |
| + decision); |
| #else |
| PermissionRequestManager* manager = |
| PermissionRequestManager::FromWebContents(web_contents()); |