chrome/browser/safe_browsing/permission_reporter_browsertest.cc - Issue 2182883002: Permissions: Rename PermissionBubbleView to PermissionPromptInterface

Unified Diff: chrome/browser/safe_browsing/permission_reporter_browsertest.cc

Issue 2182883002: Permissions: Rename PermissionBubbleView to PermissionPromptInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Further renames Created 4 years, 5 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

« chrome/browser/permissions/permission_request_manager_unittest.cc ('K') | « chrome/browser/permissions/permission_request_manager_unittest.cc ('k') | chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h » ('j') | chrome/browser/ui/website_settings/mock_permission_prompt_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/permission_reporter_browsertest.cc

diff --git a/chrome/browser/safe_browsing/permission_reporter_browsertest.cc b/chrome/browser/safe_browsing/permission_reporter_browsertest.cc

index 65869cb812f4de0cb17e4771d4d8836ea2019ddd..d842d9163ce20f6cf06378c022cb4e123741cd9b 100644

--- a/chrome/browser/safe_browsing/permission_reporter_browsertest.cc

+++ b/chrome/browser/safe_browsing/permission_reporter_browsertest.cc

@@ -15,7 +15,7 @@

#include "chrome/browser/safe_browsing/safe_browsing_service.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

-#include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h"

+#include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/safe_browsing/permission_report.pb.h"

#include "chrome/test/base/in_process_browser_test.h"

@@ -46,7 +46,7 @@ class PermissionReporterBrowserTest : public InProcessBrowserTest {

PermissionRequestManager* manager = GetPermissionRequestManager();

mock_permission_bubble_factory_.reset(

- new MockPermissionBubbleFactory(manager));

+ new MockPermissionPromptFactory(manager));

manager->DisplayPendingRequests();

#if !defined(OS_CHROMEOS)

@@ -83,7 +83,7 @@ class PermissionReporterBrowserTest : public InProcessBrowserTest {

void AcceptBubble() { GetPermissionRequestManager()->Accept(); }

- MockPermissionBubbleFactory* bubble_factory() {

+ MockPermissionPromptFactory* bubble_factory() {

raymes 2016/08/01 00:58:13 prompt_factory

tsergeant 2016/08/01 23:41:12 Done.

return mock_permission_bubble_factory_.get();

raymes 2016/08/01 00:58:13 prompt_factory

tsergeant 2016/08/01 23:41:12 Done.

}

@@ -92,7 +92,7 @@ class PermissionReporterBrowserTest : public InProcessBrowserTest {

}

private:

- std::unique_ptr<MockPermissionBubbleFactory> mock_permission_bubble_factory_;

+ std::unique_ptr<MockPermissionPromptFactory> mock_permission_bubble_factory_;

// Owned by permission reporter.

MockPermissionReportSender* mock_report_sender_;