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

Side by Side Diff: chrome/browser/safe_browsing/permission_reporter_browsertest.cc

Issue 2269503002: Permission Action Reporting: Make the browsertest work with SyncTest framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make disabled again. 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/run_loop.h"
10 #include "base/test/simple_test_clock.h" 11 #include "base/test/simple_test_clock.h"
11 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/permissions/permission_request_manager.h" 13 #include "chrome/browser/permissions/permission_request_manager.h"
14 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/safe_browsing/mock_permission_report_sender.h" 15 #include "chrome/browser/safe_browsing/mock_permission_report_sender.h"
14 #include "chrome/browser/safe_browsing/ping_manager.h" 16 #include "chrome/browser/safe_browsing/ping_manager.h"
15 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 17 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
18 #include "chrome/browser/sync/test/integration/sync_test.h"
16 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 20 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h" 21 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h"
19 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/safe_browsing/permission_report.pb.h" 23 #include "chrome/common/safe_browsing/permission_report.pb.h"
21 #include "chrome/test/base/in_process_browser_test.h" 24 #include "chrome/test/base/in_process_browser_test.h"
22 #include "chrome/test/base/ui_test_utils.h" 25 #include "chrome/test/base/ui_test_utils.h"
23 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
24 27
25 #if !defined(OS_CHROMEOS) 28 #if !defined(OS_CHROMEOS)
26 #include "chrome/browser/signin/signin_manager_factory.h" 29 #include "chrome/browser/signin/signin_manager_factory.h"
27 #include "components/signin/core/browser/signin_manager.h" 30 #include "components/signin/core/browser/signin_manager.h"
28 #endif 31 #endif
29 32
30 namespace safe_browsing { 33 namespace safe_browsing {
31 34
32 class PermissionReporterBrowserTest : public InProcessBrowserTest { 35 class PermissionReporterBrowserTest : public SyncTest {
36 public:
37 PermissionReporterBrowserTest() : SyncTest(SINGLE_CLIENT) {}
38 ~PermissionReporterBrowserTest() override {}
39
33 protected: 40 protected:
34 void SetUpOnMainThread() override { 41 void SetUpOnMainThread() override {
35 InProcessBrowserTest::SetUpOnMainThread(); 42 SyncTest::SetUpOnMainThread();
36 43
37 base::RunLoop run_loop; 44 base::RunLoop run_loop;
38 content::BrowserThread::PostTaskAndReply( 45 content::BrowserThread::PostTaskAndReply(
39 content::BrowserThread::IO, FROM_HERE, 46 content::BrowserThread::IO, FROM_HERE,
40 base::Bind( 47 base::Bind(
41 &PermissionReporterBrowserTest::AttachMockReportSenderOnIOThread, 48 &PermissionReporterBrowserTest::AttachMockReportSenderOnIOThread,
42 base::Unretained(this), 49 base::Unretained(this),
43 make_scoped_refptr(g_browser_process->safe_browsing_service())), 50 make_scoped_refptr(g_browser_process->safe_browsing_service())),
44 run_loop.QuitClosure()); 51 run_loop.QuitClosure());
45 run_loop.Run(); 52 run_loop.Run();
46
47 PermissionRequestManager* manager = GetPermissionRequestManager();
48 mock_permission_prompt_factory_ =
49 base::MakeUnique<MockPermissionPromptFactory>(manager);
50 manager->DisplayPendingRequests();
51
52 #if !defined(OS_CHROMEOS)
53 SigninManager* signin_manager =
54 SigninManagerFactory::GetForProfile(browser()->profile());
55 signin_manager->SetAuthenticatedAccountInfo("gaia_id", "fake_username");
56 #endif
57 }
58
59 void TearDownOnMainThread() override {
60 InProcessBrowserTest::TearDownOnMainThread();
61 mock_permission_prompt_factory_.reset();
62 } 53 }
63 54
64 void SetUpCommandLine(base::CommandLine* command_line) override { 55 void SetUpCommandLine(base::CommandLine* command_line) override {
56 SyncTest::SetUpCommandLine(command_line);
65 command_line->AppendSwitch(switches::kEnablePermissionActionReporting); 57 command_line->AppendSwitch(switches::kEnablePermissionActionReporting);
66 } 58 }
67 59
68 void AttachMockReportSenderOnIOThread( 60 void AttachMockReportSenderOnIOThread(
69 scoped_refptr<SafeBrowsingService> safe_browsing_service) { 61 scoped_refptr<SafeBrowsingService> safe_browsing_service) {
70 DCHECK_CURRENTLY_ON(content::BrowserThread::IO); 62 DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
71 63
72 mock_report_sender_ = new MockPermissionReportSender; 64 mock_report_sender_ = new MockPermissionReportSender;
73 65
74 safe_browsing_service->ping_manager()->permission_reporter_.reset( 66 safe_browsing_service->ping_manager()->permission_reporter_.reset(
75 new PermissionReporter(base::WrapUnique(mock_report_sender_), 67 new PermissionReporter(base::WrapUnique(mock_report_sender_),
76 base::WrapUnique(new base::SimpleTestClock))); 68 base::WrapUnique(new base::SimpleTestClock)));
77 } 69 }
78 70
79 PermissionRequestManager* GetPermissionRequestManager() { 71 PermissionRequestManager* GetPermissionRequestManager(Browser* browser) {
80 return PermissionRequestManager::FromWebContents( 72 return PermissionRequestManager::FromWebContents(
81 browser()->tab_strip_model()->GetActiveWebContents()); 73 browser->tab_strip_model()->GetActiveWebContents());
82 } 74 }
83 75
84 void AcceptBubble() { GetPermissionRequestManager()->Accept(); } 76 void AcceptBubble(Browser* b) { GetPermissionRequestManager(b)->Accept(); }
85
86 MockPermissionPromptFactory* prompt_factory() {
87 return mock_permission_prompt_factory_.get();
88 }
89 77
90 MockPermissionReportSender* mock_report_sender() { 78 MockPermissionReportSender* mock_report_sender() {
91 return mock_report_sender_; 79 return mock_report_sender_;
92 } 80 }
93 81
94 private: 82 private:
95 std::unique_ptr<MockPermissionPromptFactory> mock_permission_prompt_factory_;
96
97 // Owned by permission reporter. 83 // Owned by permission reporter.
98 MockPermissionReportSender* mock_report_sender_; 84 MockPermissionReportSender* mock_report_sender_;
85
86 DISALLOW_COPY_AND_ASSIGN(PermissionReporterBrowserTest);
99 }; 87 };
100 88
101 // Test that permission action report will be sent if the user is opted into it. 89 // Test that permission action report will be sent if the user is opted into it.
102 // TODO(kcarattini): Make this test pass with the call to Sync backends.
103 // TODO(kcarattini): Address crbug/638316 to reenable this test. 90 // TODO(kcarattini): Address crbug/638316 to reenable this test.
104 IN_PROC_BROWSER_TEST_F(PermissionReporterBrowserTest, 91 IN_PROC_BROWSER_TEST_F(PermissionReporterBrowserTest,
105 DISABLED_PermissionActionReporting) { 92 DISABLED_PermissionActionReporting) {
93 // Set up the Sync client.
94 ASSERT_TRUE(SetupSync());
95 Profile* profile = GetProfile(0);
96 Browser* browser = CreateBrowser(profile);
97
98 // Set up mock permission manager and prompt factory.
99 PermissionRequestManager* manager = GetPermissionRequestManager(browser);
Nathan Parker 2016/08/24 05:19:19 I'm not familiar with where this should be done (h
kcarattini 2016/08/24 06:00:12 The reason I moved this was that the fake profile
100 std::unique_ptr<MockPermissionPromptFactory> mock_permission_prompt_factory =
101 base::MakeUnique<MockPermissionPromptFactory>(manager);
102 manager->DisplayPendingRequests();
103
106 ASSERT_TRUE(embedded_test_server()->Start()); 104 ASSERT_TRUE(embedded_test_server()->Start());
107
108 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( 105 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
109 browser(), embedded_test_server()->GetURL("/permissions/request.html"), 106 browser, embedded_test_server()->GetURL("/permissions/request.html"),
110 1); 107 1);
111 108
112 prompt_factory()->WaitForPermissionBubble(); 109 mock_permission_prompt_factory->WaitForPermissionBubble();
113 EXPECT_TRUE(prompt_factory()->is_visible()); 110 EXPECT_TRUE(mock_permission_prompt_factory->is_visible());
114 111
115 AcceptBubble(); 112 AcceptBubble(browser);
116 113
117 EXPECT_FALSE(prompt_factory()->is_visible()); 114 EXPECT_FALSE(mock_permission_prompt_factory->is_visible());
118 EXPECT_EQ(1, mock_report_sender()->GetAndResetNumberOfReportsSent()); 115 EXPECT_EQ(1, mock_report_sender()->GetAndResetNumberOfReportsSent());
119 116
120 PermissionReport permission_report; 117 PermissionReport permission_report;
121 ASSERT_TRUE( 118 ASSERT_TRUE(
122 permission_report.ParseFromString(mock_report_sender()->latest_report())); 119 permission_report.ParseFromString(mock_report_sender()->latest_report()));
123 EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission()); 120 EXPECT_EQ(PermissionReport::GEOLOCATION, permission_report.permission());
124 EXPECT_EQ(PermissionReport::GRANTED, permission_report.action()); 121 EXPECT_EQ(PermissionReport::GRANTED, permission_report.action());
125 EXPECT_EQ(embedded_test_server()->base_url().spec(), 122 EXPECT_EQ(embedded_test_server()->base_url().spec(),
126 permission_report.origin()); 123 permission_report.origin());
127 EXPECT_EQ(PermissionReport::DESKTOP_PLATFORM, 124 EXPECT_EQ(PermissionReport::DESKTOP_PLATFORM,
128 permission_report.platform_type()); 125 permission_report.platform_type());
129 EXPECT_EQ(PermissionReport::NO_GESTURE, permission_report.gesture()); 126 EXPECT_EQ(PermissionReport::NO_GESTURE, permission_report.gesture());
130 EXPECT_EQ(PermissionReport::PERSIST_DECISION_UNSPECIFIED, 127 EXPECT_EQ(PermissionReport::PERSIST_DECISION_UNSPECIFIED,
131 permission_report.persisted()); 128 permission_report.persisted());
132 EXPECT_EQ(0, permission_report.num_prior_dismissals()); 129 EXPECT_EQ(0, permission_report.num_prior_dismissals());
133 EXPECT_EQ(0, permission_report.num_prior_ignores()); 130 EXPECT_EQ(0, permission_report.num_prior_ignores());
134 } 131 }
135 132
136 } // namespace safe_browsing 133 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698