chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm - Issue 2123653006: Rename PermissionBubbleRequest to PermissionRequest

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

Issue 2123653006: Rename PermissionBubbleRequest to PermissionRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission_manager_rename

Patch Set: Fix missed file 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

« no previous file with comments | « chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm ('k') | chrome/browser/ui/views/website_settings/permissions_bubble_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

index 03d29587d2821f0eb32e2732ab2434eff125abc7..7205792cc89b65a685c9e94c1743ab66d8a18705 100644

--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

@@ -12,6 +12,7 @@

#include "base/stl_util.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/permissions/mock_permission_request.h"

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

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

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

@@ -20,7 +21,6 @@

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

#import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"

#import "chrome/browser/ui/cocoa/website_settings/split_block_button.h"

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

#include "chrome/grit/generated_resources.h"

#include "grit/components_strings.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -92,7 +92,7 @@ class PermissionBubbleControllerTest : public CocoaProfileTest,

}

void AddRequest(const std::string& title) {

- MockPermissionBubbleRequest* request = new MockPermissionBubbleRequest(

+ MockPermissionRequest* request = new MockPermissionRequest(

title,

l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW),

l10n_util::GetStringUTF8(IDS_PERMISSION_DENY));

@@ -157,7 +157,7 @@ class PermissionBubbleControllerTest : public CocoaProfileTest,

protected:

PermissionBubbleController* controller_; // Weak; it deletes itself.

std::unique_ptr<PermissionBubbleCocoa> bridge_;

- std::vector<PermissionBubbleRequest*> requests_;

+ std::vector<PermissionRequest*> requests_;

std::vector<bool> accept_states_;

};