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

Side by Side Diff: chrome/browser/permissions/permission_request_manager_browsertest.cc

Issue 2182883002: Permissions: Rename PermissionBubbleView to PermissionPromptInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: thestig@ review Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/permissions/permission_request_manager.h" 5 #include "chrome/browser/permissions/permission_request_manager.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/permissions/permission_context_base.h" 10 #include "chrome/browser/permissions/permission_context_base.h"
11 #include "chrome/browser/permissions/permission_util.h" 11 #include "chrome/browser/permissions/permission_util.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h" 14 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h"
15 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
16 #include "chrome/test/base/ui_test_utils.h" 16 #include "chrome/test/base/ui_test_utils.h"
17 #include "components/variations/variations_associated_data.h" 17 #include "components/variations/variations_associated_data.h"
18 #include "content/public/browser/permission_type.h" 18 #include "content/public/browser/permission_type.h"
19 #include "content/public/test/browser_test_utils.h" 19 #include "content/public/test/browser_test_utils.h"
20 #include "content/public/test/test_utils.h" 20 #include "content/public/test/test_utils.h"
21 #include "net/test/embedded_test_server/embedded_test_server.h" 21 #include "net/test/embedded_test_server/embedded_test_server.h"
22 22
23 namespace { 23 namespace {
24 24
25 const char* kPermissionsKillSwitchFieldStudy = 25 const char* kPermissionsKillSwitchFieldStudy =
26 PermissionContextBase::kPermissionsKillSwitchFieldStudy; 26 PermissionContextBase::kPermissionsKillSwitchFieldStudy;
27 const char* kPermissionsKillSwitchBlockedValue = 27 const char* kPermissionsKillSwitchBlockedValue =
28 PermissionContextBase::kPermissionsKillSwitchBlockedValue; 28 PermissionContextBase::kPermissionsKillSwitchBlockedValue;
29 const char kPermissionsKillSwitchTestGroup[] = "TestGroup"; 29 const char kPermissionsKillSwitchTestGroup[] = "TestGroup";
30 30
31 class PermissionRequestManagerBrowserTest : public InProcessBrowserTest { 31 class PermissionRequestManagerBrowserTest : public InProcessBrowserTest {
32 public: 32 public:
33 PermissionRequestManagerBrowserTest() = default; 33 PermissionRequestManagerBrowserTest() = default;
34 ~PermissionRequestManagerBrowserTest() override = default; 34 ~PermissionRequestManagerBrowserTest() override = default;
35 35
36 void SetUpOnMainThread() override { 36 void SetUpOnMainThread() override {
37 InProcessBrowserTest::SetUpOnMainThread(); 37 InProcessBrowserTest::SetUpOnMainThread();
38 PermissionRequestManager* manager = GetPermissionRequestManager(); 38 PermissionRequestManager* manager = GetPermissionRequestManager();
39 mock_permission_bubble_factory_.reset( 39 mock_permission_prompt_factory_.reset(
40 new MockPermissionBubbleFactory(manager)); 40 new MockPermissionPromptFactory(manager));
41 manager->DisplayPendingRequests(); 41 manager->DisplayPendingRequests();
42 } 42 }
43 43
44 void TearDownOnMainThread() override { 44 void TearDownOnMainThread() override {
45 mock_permission_bubble_factory_.reset(); 45 mock_permission_prompt_factory_.reset();
46 InProcessBrowserTest::TearDownOnMainThread(); 46 InProcessBrowserTest::TearDownOnMainThread();
47 } 47 }
48 48
49 PermissionRequestManager* GetPermissionRequestManager() { 49 PermissionRequestManager* GetPermissionRequestManager() {
50 return PermissionRequestManager::FromWebContents( 50 return PermissionRequestManager::FromWebContents(
51 browser()->tab_strip_model()->GetActiveWebContents()); 51 browser()->tab_strip_model()->GetActiveWebContents());
52 } 52 }
53 53
54 MockPermissionBubbleFactory* bubble_factory() { 54 MockPermissionPromptFactory* bubble_factory() {
55 return mock_permission_bubble_factory_.get(); 55 return mock_permission_prompt_factory_.get();
56 } 56 }
57 57
58 void EnableKillSwitch(content::PermissionType permission_type) { 58 void EnableKillSwitch(content::PermissionType permission_type) {
59 std::map<std::string, std::string> params; 59 std::map<std::string, std::string> params;
60 params[PermissionUtil::GetPermissionString(permission_type)] = 60 params[PermissionUtil::GetPermissionString(permission_type)] =
61 kPermissionsKillSwitchBlockedValue; 61 kPermissionsKillSwitchBlockedValue;
62 variations::AssociateVariationParams( 62 variations::AssociateVariationParams(
63 kPermissionsKillSwitchFieldStudy, kPermissionsKillSwitchTestGroup, 63 kPermissionsKillSwitchFieldStudy, kPermissionsKillSwitchTestGroup,
64 params); 64 params);
65 base::FieldTrialList::CreateFieldTrial(kPermissionsKillSwitchFieldStudy, 65 base::FieldTrialList::CreateFieldTrial(kPermissionsKillSwitchFieldStudy,
66 kPermissionsKillSwitchTestGroup); 66 kPermissionsKillSwitchTestGroup);
67 } 67 }
68 68
69 private: 69 private:
70 std::unique_ptr<MockPermissionBubbleFactory> mock_permission_bubble_factory_; 70 std::unique_ptr<MockPermissionPromptFactory> mock_permission_prompt_factory_;
71 }; 71 };
72 72
73 // Requests before the load event should be bundled into one bubble. 73 // Requests before the load event should be bundled into one bubble.
74 // http://crbug.com/512849 flaky 74 // http://crbug.com/512849 flaky
75 IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest, 75 IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
76 DISABLED_RequestsBeforeLoad) { 76 DISABLED_RequestsBeforeLoad) {
77 ASSERT_TRUE(embedded_test_server()->Start()); 77 ASSERT_TRUE(embedded_test_server()->Start());
78 78
79 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( 79 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
80 browser(), 80 browser(),
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // Disable the trial. 242 // Disable the trial.
243 variations::testing::ClearAllVariationParams(); 243 variations::testing::ClearAllVariationParams();
244 244
245 EXPECT_TRUE(content::ExecuteScript(web_contents, "requestNotification();")); 245 EXPECT_TRUE(content::ExecuteScript(web_contents, "requestNotification();"));
246 bubble_factory()->WaitForPermissionBubble(); 246 bubble_factory()->WaitForPermissionBubble();
247 EXPECT_EQ(1, bubble_factory()->show_count()); 247 EXPECT_EQ(1, bubble_factory()->show_count());
248 EXPECT_EQ(1, bubble_factory()->total_request_count()); 248 EXPECT_EQ(1, bubble_factory()->total_request_count());
249 } 249 }
250 250
251 } // anonymous namespace 251 } // anonymous namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698