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

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: . Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 77cd82734424f053aaf59c66340a4020b1538d93..638587f07af665309373c4c275c881e2d2ccb191 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -230,11 +230,11 @@
#include "ui/base/window_open_disposition.h"
#endif
-#if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
+#if !defined(OS_ANDROID)
#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
#include "chrome/browser/ui/toolbar/media_router_action_controller.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
-#endif // defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
+#endif // !defined(OS_ANDROID)
using content::BrowserThread;
using net::URLRequestMockHTTPJob;
@@ -3647,7 +3647,6 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TaskManagerEndProcessEnabled) {
EXPECT_TRUE(task_manager::TaskManagerInterface::IsEndProcessEnabled());
}
-#if defined(ENABLE_MEDIA_ROUTER)
// Sets the proper policy before the browser is started.
template<bool enable>
class MediaRouterPolicyTest : public PolicyTest {
@@ -3715,7 +3714,6 @@ IN_PROC_BROWSER_TEST_F(MediaRouterActionDisabledPolicyTest,
EXPECT_FALSE(HasMediaRouterActionAtInit());
}
#endif // !defined(OS_ANDROID)
-#endif // defined(ENABLE_MEDIA_ROUTER)
#if BUILDFLAG(ENABLE_WEBRTC)
// Sets the proper policy before the browser is started.
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list_factory.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698