Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "base/test/histogram_tester.h" | 11 #include "base/test/histogram_tester.h" |
| 12 #include "chrome/browser/permissions/mock_permission_request.h" | 12 #include "chrome/browser/permissions/mock_permission_request.h" |
| 13 #include "chrome/browser/permissions/permission_request.h" | 13 #include "chrome/browser/permissions/permission_request.h" |
| 14 #include "chrome/browser/permissions/permission_request_manager.h" | 14 #include "chrome/browser/permissions/permission_request_manager.h" |
| 15 #include "chrome/browser/permissions/permission_uma_util.h" | 15 #include "chrome/browser/permissions/permission_uma_util.h" |
| 16 #include "chrome/browser/ui/website_settings/mock_permission_bubble_factory.h" | 16 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h" |
| 17 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 18 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | 18 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 20 | 20 |
| 21 class PermissionRequestManagerTest : public ChromeRenderViewHostTestHarness { | 21 class PermissionRequestManagerTest : public ChromeRenderViewHostTestHarness { |
| 22 public: | 22 public: |
| 23 PermissionRequestManagerTest() | 23 PermissionRequestManagerTest() |
| 24 : ChromeRenderViewHostTestHarness(), | 24 : ChromeRenderViewHostTestHarness(), |
| 25 request1_("test1", | 25 request1_("test1", |
| 26 PermissionRequestType::QUOTA, | 26 PermissionRequestType::QUOTA, |
| 27 PermissionRequestGestureType::GESTURE), | 27 PermissionRequestGestureType::GESTURE), |
| 28 request2_("test2", | 28 request2_("test2", |
| 29 PermissionRequestType::DOWNLOAD, | 29 PermissionRequestType::DOWNLOAD, |
| 30 PermissionRequestGestureType::NO_GESTURE), | 30 PermissionRequestGestureType::NO_GESTURE), |
| 31 iframe_request_same_domain_("iframe", | 31 iframe_request_same_domain_("iframe", |
| 32 GURL("http://www.google.com/some/url")), | 32 GURL("http://www.google.com/some/url")), |
| 33 iframe_request_other_domain_("iframe", GURL("http://www.youtube.com")) { | 33 iframe_request_other_domain_("iframe", GURL("http://www.youtube.com")) { |
| 34 } | 34 } |
| 35 ~PermissionRequestManagerTest() override {} | 35 ~PermissionRequestManagerTest() override {} |
| 36 | 36 |
| 37 void SetUp() override { | 37 void SetUp() override { |
| 38 ChromeRenderViewHostTestHarness::SetUp(); | 38 ChromeRenderViewHostTestHarness::SetUp(); |
| 39 SetContents(CreateTestWebContents()); | 39 SetContents(CreateTestWebContents()); |
| 40 NavigateAndCommit(GURL("http://www.google.com")); | 40 NavigateAndCommit(GURL("http://www.google.com")); |
| 41 | 41 |
| 42 manager_.reset(new PermissionRequestManager(web_contents())); | 42 manager_.reset(new PermissionRequestManager(web_contents())); |
| 43 view_factory_.reset(new MockPermissionBubbleFactory(manager_.get())); | 43 view_factory_.reset(new MockPermissionPromptFactory(manager_.get())); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void TearDown() override { | 46 void TearDown() override { |
| 47 view_factory_.reset(); | 47 view_factory_.reset(); |
| 48 manager_.reset(); | 48 manager_.reset(); |
| 49 ChromeRenderViewHostTestHarness::TearDown(); | 49 ChromeRenderViewHostTestHarness::TearDown(); |
| 50 } | 50 } |
| 51 | 51 |
| 52 void ToggleAccept(int index, bool value) { | 52 void ToggleAccept(int index, bool value) { |
| 53 manager_->ToggleAccept(index, value); | 53 manager_->ToggleAccept(index, value); |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 84 const content::LoadCommittedDetails& details) { | 84 const content::LoadCommittedDetails& details) { |
| 85 manager_->NavigationEntryCommitted(details); | 85 manager_->NavigationEntryCommitted(details); |
| 86 } | 86 } |
| 87 | 87 |
| 88 protected: | 88 protected: |
| 89 MockPermissionRequest request1_; | 89 MockPermissionRequest request1_; |
| 90 MockPermissionRequest request2_; | 90 MockPermissionRequest request2_; |
| 91 MockPermissionRequest iframe_request_same_domain_; | 91 MockPermissionRequest iframe_request_same_domain_; |
| 92 MockPermissionRequest iframe_request_other_domain_; | 92 MockPermissionRequest iframe_request_other_domain_; |
| 93 std::unique_ptr<PermissionRequestManager> manager_; | 93 std::unique_ptr<PermissionRequestManager> manager_; |
| 94 std::unique_ptr<MockPermissionBubbleFactory> view_factory_; | 94 std::unique_ptr<MockPermissionPromptFactory> view_factory_; |
|
raymes
2016/08/01 00:58:13
prompt_factory
tsergeant
2016/08/01 23:41:12
Done.
| |
| 95 }; | 95 }; |
| 96 | 96 |
| 97 TEST_F(PermissionRequestManagerTest, SingleRequest) { | 97 TEST_F(PermissionRequestManagerTest, SingleRequest) { |
| 98 manager_->AddRequest(&request1_); | 98 manager_->AddRequest(&request1_); |
| 99 manager_->DisplayPendingRequests(); | 99 manager_->DisplayPendingRequests(); |
| 100 WaitForCoalescing(); | 100 WaitForCoalescing(); |
| 101 | 101 |
| 102 EXPECT_TRUE(view_factory_->is_visible()); | 102 EXPECT_TRUE(view_factory_->is_visible()); |
| 103 ASSERT_EQ(view_factory_->request_count(), 1); | 103 ASSERT_EQ(view_factory_->request_count(), 1); |
| 104 | 104 |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 639 1); | 639 1); |
| 640 histograms.ExpectBucketCount( | 640 histograms.ExpectBucketCount( |
| 641 PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied, | 641 PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied, |
| 642 static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA), | 642 static_cast<base::HistogramBase::Sample>(PermissionRequestType::QUOTA), |
| 643 1); | 643 1); |
| 644 histograms.ExpectBucketCount( | 644 histograms.ExpectBucketCount( |
| 645 PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied, | 645 PermissionUmaUtil::kPermissionsPromptMergedBubbleDenied, |
| 646 static_cast<base::HistogramBase::Sample>(PermissionRequestType::DOWNLOAD), | 646 static_cast<base::HistogramBase::Sample>(PermissionRequestType::DOWNLOAD), |
| 647 1); | 647 1); |
| 648 } | 648 } |
| OLD | NEW |