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

Side by Side Diff: chrome/browser/notifications/platform_notification_service_interactive_uitest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase Created 3 years, 10 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 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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/permissions/permission_manager.h" 23 #include "chrome/browser/permissions/permission_manager.h"
24 #include "chrome/browser/permissions/permission_request_manager.h" 24 #include "chrome/browser/permissions/permission_request_manager.h"
25 #include "chrome/browser/ui/browser.h" 25 #include "chrome/browser/ui/browser.h"
26 #include "chrome/browser/ui/browser_window.h" 26 #include "chrome/browser/ui/browser_window.h"
27 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" 27 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
28 #include "chrome/browser/ui/tabs/tab_strip_model.h" 28 #include "chrome/browser/ui/tabs/tab_strip_model.h"
29 #include "chrome/common/chrome_features.h" 29 #include "chrome/common/chrome_features.h"
30 #include "chrome/test/base/in_process_browser_test.h" 30 #include "chrome/test/base/in_process_browser_test.h"
31 #include "chrome/test/base/interactive_test_utils.h" 31 #include "chrome/test/base/interactive_test_utils.h"
32 #include "chrome/test/base/ui_test_utils.h" 32 #include "chrome/test/base/ui_test_utils.h"
33 #include "content/public/browser/permission_type.h"
34 #include "content/public/common/content_features.h" 33 #include "content/public/common/content_features.h"
35 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
36 #include "content/public/test/browser_test_utils.h" 35 #include "content/public/test/browser_test_utils.h"
37 #include "net/base/filename_util.h" 36 #include "net/base/filename_util.h"
38 #include "net/test/embedded_test_server/embedded_test_server.h" 37 #include "net/test/embedded_test_server/embedded_test_server.h"
39 #include "testing/gmock/include/gmock/gmock.h" 38 #include "testing/gmock/include/gmock/gmock.h"
40 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h" 39 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h"
41 40
42 #if BUILDFLAG(ENABLE_BACKGROUND) 41 #if BUILDFLAG(ENABLE_BACKGROUND)
43 #include "chrome/browser/lifetime/keep_alive_registry.h" 42 #include "chrome/browser/lifetime/keep_alive_registry.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 service()->SetNotificationDisplayServiceForTesting(nullptr); 155 service()->SetNotificationDisplayServiceForTesting(nullptr);
157 } 156 }
158 157
159 void PlatformNotificationServiceBrowserTest:: 158 void PlatformNotificationServiceBrowserTest::
160 GrantNotificationPermissionForTest() const { 159 GrantNotificationPermissionForTest() const {
161 GURL origin = TestPageUrl().GetOrigin(); 160 GURL origin = TestPageUrl().GetOrigin();
162 161
163 DesktopNotificationProfileUtil::GrantPermission(browser()->profile(), origin); 162 DesktopNotificationProfileUtil::GrantPermission(browser()->profile(), origin);
164 ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED, 163 ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
165 PermissionManager::Get(browser()->profile()) 164 PermissionManager::Get(browser()->profile())
166 ->GetPermissionStatus(content::PermissionType::NOTIFICATIONS, 165 ->GetPermissionStatus(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
167 origin, origin)); 166 origin, origin));
168 } 167 }
169 168
170 void PlatformNotificationServiceBrowserTest::NavigateToTestPage( 169 void PlatformNotificationServiceBrowserTest::NavigateToTestPage(
171 const std::string& path) const { 170 const std::string& path) const {
172 ui_test_utils::NavigateToURL(browser(), https_server_->GetURL(path)); 171 ui_test_utils::NavigateToURL(browser(), https_server_->GetURL(path));
173 } 172 }
174 173
175 bool PlatformNotificationServiceBrowserTest::RunScript( 174 bool PlatformNotificationServiceBrowserTest::RunScript(
176 const std::string& script, std::string* result) const { 175 const std::string& script, std::string* result) const {
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest, 458 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
460 DISABLED_CheckFilePermissionNotGranted) { 459 DISABLED_CheckFilePermissionNotGranted) {
461 // This case should succeed because a normal page URL is used. 460 // This case should succeed because a normal page URL is used.
462 std::string script_result; 461 std::string script_result;
463 462
464 PermissionManager* permission_manager = 463 PermissionManager* permission_manager =
465 PermissionManager::Get(browser()->profile()); 464 PermissionManager::Get(browser()->profile());
466 465
467 EXPECT_EQ(blink::mojom::PermissionStatus::ASK, 466 EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
468 permission_manager->GetPermissionStatus( 467 permission_manager->GetPermissionStatus(
469 content::PermissionType::NOTIFICATIONS, TestPageUrl(), 468 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(),
470 TestPageUrl())); 469 TestPageUrl()));
471 470
472 RequestAndAcceptPermission(); 471 RequestAndAcceptPermission();
473 EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED, 472 EXPECT_EQ(blink::mojom::PermissionStatus::GRANTED,
474 permission_manager->GetPermissionStatus( 473 permission_manager->GetPermissionStatus(
475 content::PermissionType::NOTIFICATIONS, TestPageUrl(), 474 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, TestPageUrl(),
476 TestPageUrl())); 475 TestPageUrl()));
477 476
478 // This case should fail because a file URL is used. 477 // This case should fail because a file URL is used.
479 base::FilePath dir_source_root; 478 base::FilePath dir_source_root;
480 EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &dir_source_root)); 479 EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &dir_source_root));
481 base::FilePath full_file_path = 480 base::FilePath full_file_path =
482 dir_source_root.Append(server_root()).AppendASCII(kTestFileName); 481 dir_source_root.Append(server_root()).AppendASCII(kTestFileName);
483 GURL file_url(net::FilePathToFileURL(full_file_path)); 482 GURL file_url(net::FilePathToFileURL(full_file_path));
484 483
485 ui_test_utils::NavigateToURL(browser(), file_url); 484 ui_test_utils::NavigateToURL(browser(), file_url);
486 485
487 EXPECT_EQ(blink::mojom::PermissionStatus::ASK, 486 EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
488 permission_manager->GetPermissionStatus( 487 permission_manager->GetPermissionStatus(
489 content::PermissionType::NOTIFICATIONS, file_url, file_url)); 488 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, file_url, file_url));
490 489
491 RequestAndAcceptPermission(); 490 RequestAndAcceptPermission();
492 EXPECT_EQ(blink::mojom::PermissionStatus::ASK, 491 EXPECT_EQ(blink::mojom::PermissionStatus::ASK,
493 permission_manager->GetPermissionStatus( 492 permission_manager->GetPermissionStatus(
494 content::PermissionType::NOTIFICATIONS, file_url, file_url)) 493 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, file_url, file_url))
495 << "If this test fails, you may have fixed a bug preventing file origins " 494 << "If this test fails, you may have fixed a bug preventing file origins "
496 << "from sending their origin from Blink; if so you need to update the " 495 << "from sending their origin from Blink; if so you need to update the "
497 << "display function for notification origins to show the file path."; 496 << "display function for notification origins to show the file path.";
498 } 497 }
499 498
500 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest, 499 IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
501 DataUrlAsNotificationImage) { 500 DataUrlAsNotificationImage) {
502 ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest()); 501 ASSERT_NO_FATAL_FAILURE(GrantNotificationPermissionForTest());
503 502
504 std::string script_result; 503 std::string script_result;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 RunScript("DisplayPersistentAllOptionsNotification()", &script_result)); 775 RunScript("DisplayPersistentAllOptionsNotification()", &script_result));
777 EXPECT_EQ("ok", script_result); 776 EXPECT_EQ("ok", script_result);
778 777
779 ASSERT_EQ(1u, ui_manager()->GetNotificationCount()); 778 ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
780 const Notification& notification = ui_manager()->GetNotificationAt(0); 779 const Notification& notification = ui_manager()->GetNotificationAt(0);
781 780
782 // Since the kNotificationContentImage kill switch has disabled images, the 781 // Since the kNotificationContentImage kill switch has disabled images, the
783 // notification should be shown without an image. 782 // notification should be shown without an image.
784 EXPECT_TRUE(notification.image().IsEmpty()); 783 EXPECT_TRUE(notification.image().IsEmpty());
785 } 784 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698