Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5667)

Unified Diff: chrome/browser/permissions/permission_request_manager_unittest.cc

Issue 2123653006: Rename PermissionBubbleRequest to PermissionRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission_manager_rename
Patch Set: Fix Android 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
Index: chrome/browser/permissions/permission_request_manager_unittest.cc
diff --git a/chrome/browser/permissions/permission_request_manager_unittest.cc b/chrome/browser/permissions/permission_request_manager_unittest.cc
index 66d056e7f5fd34750828692e234454eac342025b..6801363d22ec68b12763edb31501efc886d63700 100644
--- a/chrome/browser/permissions/permission_request_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_request_manager_unittest.cc
@@ -9,11 +9,11 @@
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/histogram_tester.h"
+#include "chrome/browser/permissions/mock_permission_request.h"
+#include "chrome/browser/permissions/permission_request.h"
#include "chrome/browser/permissions/permission_request_manager.h"
#include "chrome/browser/permissions/permission_uma_util.h"
#include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h"
-#include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -82,10 +82,10 @@ class PermissionRequestManagerTest : public ChromeRenderViewHostTestHarness {
}
protected:
- MockPermissionBubbleRequest request1_;
- MockPermissionBubbleRequest request2_;
- MockPermissionBubbleRequest iframe_request_same_domain_;
- MockPermissionBubbleRequest iframe_request_other_domain_;
+ MockPermissionRequest request1_;
+ MockPermissionRequest request2_;
+ MockPermissionRequest iframe_request_same_domain_;
+ MockPermissionRequest iframe_request_other_domain_;
std::unique_ptr<PermissionRequestManager> manager_;
std::unique_ptr<MockPermissionBubbleFactory> view_factory_;
};
@@ -252,7 +252,7 @@ TEST_F(PermissionRequestManagerTest, SameRequestRejected) {
TEST_F(PermissionRequestManagerTest, DuplicateRequestCancelled) {
manager_->DisplayPendingRequests();
manager_->AddRequest(&request1_);
- MockPermissionBubbleRequest dupe_request("test1");
+ MockPermissionRequest dupe_request("test1");
manager_->AddRequest(&dupe_request);
EXPECT_FALSE(dupe_request.finished());
EXPECT_FALSE(request1_.finished());
@@ -267,12 +267,12 @@ TEST_F(PermissionRequestManagerTest, DuplicateQueuedRequest) {
WaitForCoalescing();
manager_->AddRequest(&request2_);
- MockPermissionBubbleRequest dupe_request("test1");
+ MockPermissionRequest dupe_request("test1");
manager_->AddRequest(&dupe_request);
EXPECT_FALSE(dupe_request.finished());
EXPECT_FALSE(request1_.finished());
- MockPermissionBubbleRequest dupe_request2("test2");
+ MockPermissionRequest dupe_request2("test2");
manager_->AddRequest(&dupe_request2);
EXPECT_FALSE(dupe_request2.finished());
EXPECT_FALSE(request2_.finished());

Powered by Google App Engine
This is Rietveld 408576698