Chromium Code Reviews| Index: chrome/browser/policy/policy_browsertest.cc |
| diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc |
| index 96c9bf29101755209eadb5e318d6ea1f80cf60ea..0fe659b33f640dac08c99ac9ce780fbea658a27a 100644 |
| --- a/chrome/browser/policy/policy_browsertest.cc |
| +++ b/chrome/browser/policy/policy_browsertest.cc |
| @@ -227,6 +227,13 @@ |
| #include "ui/base/window_open_disposition.h" |
| #endif |
| +#if defined(ENABLE_MEDIA_ROUTER) |
|
pastarmovj
2017/01/24 23:03:46
nit: you can combine the two if-defs in one.
takumif
2017/01/26 23:12:35
Done.
|
| +#if !defined(OS_ANDROID) |
| +#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
| +#include "chrome/browser/ui/toolbar/media_router_action_controller.h" |
| +#endif // !defined(OS_ANDROID) |
| +#endif // defined(ENABLE_MEDIA_ROUTER) |
| + |
| using content::BrowserThread; |
| using net::URLRequestMockHTTPJob; |
| using testing::Mock; |
| @@ -3581,6 +3588,47 @@ IN_PROC_BROWSER_TEST_F(MediaRouterEnabledPolicyTest, MediaRouterEnabled) { |
| IN_PROC_BROWSER_TEST_F(MediaRouterDisabledPolicyTest, MediaRouterDisabled) { |
| EXPECT_FALSE(media_router::MediaRouterEnabled(browser()->profile())); |
| } |
| + |
| +#if !defined(OS_ANDROID) |
| +template <bool enable> |
| +class MediaRouterActionPolicyTest : public PolicyTest { |
| + public: |
| + void SetUpInProcessBrowserTestFixture() override { |
| + PolicyTest::SetUpInProcessBrowserTestFixture(); |
| + PolicyMap policies; |
| + policies.Set(key::kShowCastIconInToolbar, POLICY_LEVEL_MANDATORY, |
| + POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
| + base::MakeUnique<base::FundamentalValue>(enable), nullptr); |
| + provider_.UpdateChromePolicy(policies); |
| + } |
| + |
| + protected: |
| + bool HasMediaRouterActionAtInit() const { |
| + const std::set<std::string>& component_ids = |
| + ComponentToolbarActionsFactory::GetInstance()->GetInitialComponentIds( |
| + browser()->profile()); |
| + return base::ContainsKey( |
| + component_ids, ComponentToolbarActionsFactory::kMediaRouterActionId); |
| + } |
| +}; |
| + |
| +using MediaRouterActionEnabledPolicyTest = MediaRouterActionPolicyTest<true>; |
| +using MediaRouterActionDisabledPolicyTest = MediaRouterActionPolicyTest<false>; |
| + |
| +IN_PROC_BROWSER_TEST_F(MediaRouterActionEnabledPolicyTest, |
| + MediaRouterActionEnabled) { |
| + EXPECT_TRUE( |
| + MediaRouterActionController::IsActionShownByPolicy(browser()->profile())); |
| + EXPECT_TRUE(HasMediaRouterActionAtInit()); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(MediaRouterActionDisabledPolicyTest, |
| + MediaRouterActionDisabled) { |
| + EXPECT_FALSE( |
| + MediaRouterActionController::IsActionShownByPolicy(browser()->profile())); |
| + EXPECT_FALSE(HasMediaRouterActionAtInit()); |
| +} |
| +#endif // !defined(OS_ANDROID) |
| #endif // defined(ENABLE_MEDIA_ROUTER) |
| #if BUILDFLAG(ENABLE_WEBRTC) |