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

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

Issue 2699973002: MD Settings: enable by default in client (Closed)
Patch Set: disable cros 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 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 bade3cf44661088212abf40f58c72024b49ba963..fda3b2834aef58014ce56fca207d95c960fd762a 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -31,6 +31,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
#include "base/test/test_file_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/time/time.h"
@@ -83,6 +84,7 @@
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/location_bar/location_bar.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -4364,6 +4366,9 @@ class ChromeOSPolicyTest : public PolicyTest {
};
IN_PROC_BROWSER_TEST_F(ChromeOSPolicyTest, SystemTimezoneAutomaticDetection) {
+ base::test::ScopedFeatureList disable_md_settings;
+ disable_md_settings.InitAndDisableFeature(features::kMaterialDesignSettings);
+
ui_test_utils::NavigateToURL(browser(), GURL("chrome://settings"));
chromeos::system::TimeZoneResolverManager* manager =
g_browser_process->platform_part()->GetTimezoneResolverManager();

Powered by Google App Engine
This is Rietveld 408576698