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

Side by Side 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: 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/safe_browsing/permission_reporter.h" 5 #include "chrome/browser/safe_browsing/permission_reporter.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/test/simple_test_clock.h" 10 #include "base/test/simple_test_clock.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/permissions/permission_request_manager.h" 12 #include "chrome/browser/permissions/permission_request_manager.h"
13 #include "chrome/browser/safe_browsing/mock_permission_report_sender.h" 13 #include "chrome/browser/safe_browsing/mock_permission_report_sender.h"
14 #include "chrome/browser/safe_browsing/ping_manager.h" 14 #include "chrome/browser/safe_browsing/ping_manager.h"
15 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 15 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h" 18 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h"
19 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/safe_browsing/permission_report.pb.h" 20 #include "chrome/common/safe_browsing/permission_report.pb.h"
21 #include "chrome/test/base/in_process_browser_test.h" 21 #include "chrome/test/base/in_process_browser_test.h"
22 #include "chrome/test/base/ui_test_utils.h" 22 #include "chrome/test/base/ui_test_utils.h"
23 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
24 24
25 #if !defined(OS_CHROMEOS) 25 #if !defined(OS_CHROMEOS)
26 #include "chrome/browser/signin/signin_manager_factory.h" 26 #include "chrome/browser/signin/signin_manager_factory.h"
27 #include "components/signin/core/browser/signin_manager.h" 27 #include "components/signin/core/browser/signin_manager.h"
28 #endif 28 #endif
29 29
30 namespace safe_browsing { 30 namespace safe_browsing {
31 31
32 class PermissionReporterBrowserTest : public InProcessBrowserTest { 32 class PermissionReporterBrowserTest : public InProcessBrowserTest {
33 protected: 33 protected:
34 void SetUpOnMainThread() override { 34 void SetUpOnMainThread() override {
35 InProcessBrowserTest::SetUpOnMainThread(); 35 InProcessBrowserTest::SetUpOnMainThread();
36 36
37 base::RunLoop run_loop; 37 base::RunLoop run_loop;
38 content::BrowserThread::PostTaskAndReply( 38 content::BrowserThread::PostTaskAndReply(
39 content::BrowserThread::IO, FROM_HERE, 39 content::BrowserThread::IO, FROM_HERE,
40 base::Bind( 40 base::Bind(
41 &PermissionReporterBrowserTest::AttachMockReportSenderOnIOThread, 41 &PermissionReporterBrowserTest::AttachMockReportSenderOnIOThread,
42 this, 42 this,
43 make_scoped_refptr(g_browser_process->safe_browsing_service())), 43 make_scoped_refptr(g_browser_process->safe_browsing_service())),
44 run_loop.QuitClosure()); 44 run_loop.QuitClosure());
45 run_loop.Run(); 45 run_loop.Run();
46 46
47 PermissionRequestManager* manager = GetPermissionRequestManager(); 47 PermissionRequestManager* manager = GetPermissionRequestManager();
48 mock_permission_bubble_factory_.reset( 48 mock_permission_prompt_factory_ =
49 new MockPermissionBubbleFactory(manager)); 49 base::MakeUnique<MockPermissionPromptFactory>(manager);
50 manager->DisplayPendingRequests(); 50 manager->DisplayPendingRequests();
51 51
52 #if !defined(OS_CHROMEOS) 52 #if !defined(OS_CHROMEOS)
53 SigninManager* signin_manager = 53 SigninManager* signin_manager =
54 SigninManagerFactory::GetForProfile(browser()->profile()); 54 SigninManagerFactory::GetForProfile(browser()->profile());
55 signin_manager->SetAuthenticatedAccountInfo("gaia_id", "fake_username"); 55 signin_manager->SetAuthenticatedAccountInfo("gaia_id", "fake_username");
56 #endif 56 #endif
57 } 57 }
58 58
59 void TearDownOnMainThread() override { 59 void TearDownOnMainThread() override {
60 InProcessBrowserTest::TearDownOnMainThread(); 60 InProcessBrowserTest::TearDownOnMainThread();
61 mock_permission_bubble_factory_.reset(); 61 mock_permission_prompt_factory_.reset();
62 } 62 }
63 63
64 void SetUpCommandLine(base::CommandLine* command_line) override { 64 void SetUpCommandLine(base::CommandLine* command_line) override {
65 command_line->AppendSwitch(switches::kEnablePermissionActionReporting); 65 command_line->AppendSwitch(switches::kEnablePermissionActionReporting);
66 } 66 }
67 67
68 void AttachMockReportSenderOnIOThread( 68 void AttachMockReportSenderOnIOThread(
69 scoped_refptr<SafeBrowsingService> safe_browsing_service) { 69 scoped_refptr<SafeBrowsingService> safe_browsing_service) {
70 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 70 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
71 71
72 mock_report_sender_ = new MockPermissionReportSender; 72 mock_report_sender_ = new MockPermissionReportSender;
73 73
74 safe_browsing_service->ping_manager()->permission_reporter_.reset( 74 safe_browsing_service->ping_manager()->permission_reporter_.reset(
75 new PermissionReporter(base::WrapUnique(mock_report_sender_), 75 new PermissionReporter(base::WrapUnique(mock_report_sender_),
76 base::WrapUnique(new base::SimpleTestClock))); 76 base::WrapUnique(new base::SimpleTestClock)));
77 } 77 }
78 78
79 PermissionRequestManager* GetPermissionRequestManager() { 79 PermissionRequestManager* GetPermissionRequestManager() {
80 return PermissionRequestManager::FromWebContents( 80 return PermissionRequestManager::FromWebContents(
81 browser()->tab_strip_model()->GetActiveWebContents()); 81 browser()->tab_strip_model()->GetActiveWebContents());
82 } 82 }
83 83
84 void AcceptBubble() { GetPermissionRequestManager()->Accept(); } 84 void AcceptBubble() { GetPermissionRequestManager()->Accept(); }
85 85
86 MockPermissionBubbleFactory* bubble_factory() { 86 MockPermissionPromptFactory* prompt_factory() {
87 return mock_permission_bubble_factory_.get(); 87 return mock_permission_prompt_factory_.get();
88 } 88 }
89 89
90 MockPermissionReportSender* mock_report_sender() { 90 MockPermissionReportSender* mock_report_sender() {
91 return mock_report_sender_; 91 return mock_report_sender_;
92 } 92 }
93 93
94 private: 94 private:
95 std::unique_ptr<MockPermissionBubbleFactory> mock_permission_bubble_factory_; 95 std::unique_ptr<MockPermissionPromptFactory> mock_permission_prompt_factory_;
96 96
97 // Owned by permission reporter. 97 // Owned by permission reporter.
98 MockPermissionReportSender* mock_report_sender_; 98 MockPermissionReportSender* mock_report_sender_;
99 }; 99 };
100 100
101 // Test that permission action report will be sent if the user is opted into it. 101 // Test that permission action report will be sent if the user is opted into it.
102 IN_PROC_BROWSER_TEST_F(PermissionReporterBrowserTest, 102 IN_PROC_BROWSER_TEST_F(PermissionReporterBrowserTest,
103 PermissionActionReporting) { 103 PermissionActionReporting) {
104 ASSERT_TRUE(embedded_test_server()->Start()); 104 ASSERT_TRUE(embedded_test_server()->Start());
105 105
106 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( 106 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
107 browser(), embedded_test_server()->GetURL("/permissions/request.html"), 107 browser(), embedded_test_server()->GetURL("/permissions/request.html"),
108 1); 108 1);
109 109
110 bubble_factory()->WaitForPermissionBubble(); 110 prompt_factory()->WaitForPermissionBubble();
111 EXPECT_TRUE(bubble_factory()->is_visible()); 111 EXPECT_TRUE(prompt_factory()->is_visible());
112 112
113 AcceptBubble(); 113 AcceptBubble();
114 114
115 EXPECT_FALSE(bubble_factory()->is_visible()); 115 EXPECT_FALSE(prompt_factory()->is_visible());
116 EXPECT_EQ(1, mock_report_sender()->GetAndResetNumberOfReportsSent()); 116 EXPECT_EQ(1, mock_report_sender()->GetAndResetNumberOfReportsSent());
117 117
118 PermissionReport permission_report; 118 PermissionReport permission_report;
119 ASSERT_TRUE( 119 ASSERT_TRUE(
120 permission_report.ParseFromString(mock_report_sender()->latest_report())); 120 permission_report.ParseFromString(mock_report_sender()->latest_report()));
121 EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission()); 121 EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission());
122 EXPECT_EQ(PermissionReport::GRANTED, permission_report.action()); 122 EXPECT_EQ(PermissionReport::GRANTED, permission_report.action());
123 EXPECT_EQ(embedded_test_server()->base_url().spec(), 123 EXPECT_EQ(embedded_test_server()->base_url().spec(),
124 permission_report.origin()); 124 permission_report.origin());
125 EXPECT_EQ(PermissionReport::DESKTOP_PLATFORM, 125 EXPECT_EQ(PermissionReport::DESKTOP_PLATFORM,
126 permission_report.platform_type()); 126 permission_report.platform_type());
127 EXPECT_EQ(PermissionReport::NO_GESTURE, permission_report.gesture()); 127 EXPECT_EQ(PermissionReport::NO_GESTURE, permission_report.gesture());
128 } 128 }
129 129
130 } // namespace safe_browsing 130 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698