| 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 fb5b4c8973d4c6bd9e43b47d89f606653de168c5..6bc7c3329199eb044681c62153552662be34893c 100644
|
| --- a/chrome/browser/permissions/permission_context_base_unittest.cc
|
| +++ b/chrome/browser/permissions/permission_context_base_unittest.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/infobars/infobar_service.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"
|
| #include "chrome/browser/permissions/permission_util.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/base/chrome_render_view_host_test_harness.h"
|
| @@ -117,10 +118,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());
|
|
|