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

Side by Side Diff: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/auto_reset.h" 5 #include "base/auto_reset.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
10 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 10 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
(...skipping 10 matching lines...) Expand all
21 #include "components/infobars/core/infobar_delegate.h" 21 #include "components/infobars/core/infobar_delegate.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 #include "content/public/test/web_contents_tester.h" 23 #include "content/public/test/web_contents_tester.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 26
27 using content::WebContentsTester; 27 using content::WebContentsTester;
28 28
29 class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness { 29 class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness {
30 protected: 30 protected:
31 virtual void SetUp() OVERRIDE { 31 virtual void SetUp() override {
32 ChromeRenderViewHostTestHarness::SetUp(); 32 ChromeRenderViewHostTestHarness::SetUp();
33 TabSpecificContentSettings::CreateForWebContents(web_contents()); 33 TabSpecificContentSettings::CreateForWebContents(web_contents());
34 InfoBarService::CreateForWebContents(web_contents()); 34 InfoBarService::CreateForWebContents(web_contents());
35 } 35 }
36 36
37 void CheckGeolocationBubble(size_t expected_domains, 37 void CheckGeolocationBubble(size_t expected_domains,
38 bool expect_clear_link, 38 bool expect_clear_link,
39 bool expect_reload_hint) { 39 bool expect_reload_hint) {
40 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model( 40 scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
41 ContentSettingBubbleModel::CreateContentSettingBubbleModel( 41 ContentSettingBubbleModel::CreateContentSettingBubbleModel(
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 EXPECT_FALSE(bubble_content.radio_group.radio_items.empty()); 807 EXPECT_FALSE(bubble_content.radio_group.radio_items.empty());
808 EXPECT_TRUE(bubble_content.popup_items.empty()); 808 EXPECT_TRUE(bubble_content.popup_items.empty());
809 EXPECT_TRUE(bubble_content.domain_lists.empty()); 809 EXPECT_TRUE(bubble_content.domain_lists.empty());
810 EXPECT_TRUE(bubble_content.custom_link.empty()); 810 EXPECT_TRUE(bubble_content.custom_link.empty());
811 EXPECT_FALSE(bubble_content.custom_link_enabled); 811 EXPECT_FALSE(bubble_content.custom_link_enabled);
812 EXPECT_FALSE(bubble_content.manage_link.empty()); 812 EXPECT_FALSE(bubble_content.manage_link.empty());
813 } 813 }
814 814
815 class FakeDelegate : public ProtocolHandlerRegistry::Delegate { 815 class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
816 public: 816 public:
817 virtual void RegisterExternalHandler(const std::string& protocol) OVERRIDE { 817 virtual void RegisterExternalHandler(const std::string& protocol) override {
818 // Overrides in order to not register the handler with the 818 // Overrides in order to not register the handler with the
819 // ChildProcessSecurityPolicy. That has persistent and unalterable 819 // ChildProcessSecurityPolicy. That has persistent and unalterable
820 // side effects on other tests. 820 // side effects on other tests.
821 } 821 }
822 822
823 virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( 823 virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
824 ShellIntegration::DefaultWebClientObserver* observer, 824 ShellIntegration::DefaultWebClientObserver* observer,
825 const std::string& protocol) OVERRIDE { 825 const std::string& protocol) override {
826 VLOG(1) << "CreateShellWorker"; 826 VLOG(1) << "CreateShellWorker";
827 return NULL; 827 return NULL;
828 } 828 }
829 829
830 virtual ProtocolHandlerRegistry::DefaultClientObserver* CreateShellObserver( 830 virtual ProtocolHandlerRegistry::DefaultClientObserver* CreateShellObserver(
831 ProtocolHandlerRegistry* registry) OVERRIDE { 831 ProtocolHandlerRegistry* registry) override {
832 return NULL; 832 return NULL;
833 } 833 }
834 834
835 virtual void RegisterWithOSAsDefaultClient( 835 virtual void RegisterWithOSAsDefaultClient(
836 const std::string& protocol, 836 const std::string& protocol,
837 ProtocolHandlerRegistry* registry) OVERRIDE { 837 ProtocolHandlerRegistry* registry) override {
838 VLOG(1) << "Register With OS"; 838 VLOG(1) << "Register With OS";
839 } 839 }
840 }; 840 };
841 841
842 TEST_F(ContentSettingBubbleModelTest, RPHAllow) { 842 TEST_F(ContentSettingBubbleModelTest, RPHAllow) {
843 ProtocolHandlerRegistry registry(profile(), new FakeDelegate()); 843 ProtocolHandlerRegistry registry(profile(), new FakeDelegate());
844 registry.InitProtocolSettings(); 844 registry.InitProtocolSettings();
845 845
846 const GURL page_url("http://toplevel.example/"); 846 const GURL page_url("http://toplevel.example/");
847 NavigateAndCommit(page_url); 847 NavigateAndCommit(page_url);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 { 895 {
896 ProtocolHandler handler = registry.GetHandlerFor("mailto"); 896 ProtocolHandler handler = registry.GetHandlerFor("mailto");
897 ASSERT_FALSE(handler.IsEmpty()); 897 ASSERT_FALSE(handler.IsEmpty());
898 EXPECT_EQ(CONTENT_SETTING_ALLOW, 898 EXPECT_EQ(CONTENT_SETTING_ALLOW,
899 content_settings->pending_protocol_handler_setting()); 899 content_settings->pending_protocol_handler_setting());
900 EXPECT_FALSE(registry.IsIgnored(test_handler)); 900 EXPECT_FALSE(registry.IsIgnored(test_handler));
901 } 901 }
902 902
903 registry.Shutdown(); 903 registry.Shutdown();
904 } 904 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698