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

Unified Diff: chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc

Issue 950053002: Cache the Windows Parental Controls Platform Answer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test Isolation Created 5 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/ui/window_sizer/window_sizer_ash_unittest.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index bcfdd4fd0db929d3f96e1165b6141a43fb8c77a0..6ee7d267575082bf95857b0163662a22c3aa4cbf 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -11,6 +11,7 @@
#include "ash/wm/window_resizer.h"
#include "ash/wm/window_state.h"
#include "base/compiler_specific.h"
+#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/window_sizer/window_sizer_common_unittest.h"
@@ -25,7 +26,19 @@
#include "ui/gfx/screen.h"
#include "ui/wm/public/activation_client.h"
-typedef ash::test::AshTestBase WindowSizerAshTest;
+class WindowSizerAshTest : public ash::test::AshTestBase {
+ protected:
+ static void SetUpTestCase() {
+ ash::test::AshTestBase::SetUpTestCase();
+ // Creating a browser requires platform parental controls initialization.
+ IncognitoModePrefs::InitializePlatformParentalControls();
+ }
+
+ static void TearDownTestCase() {
+ IncognitoModePrefs::UninitializePlatformParentalControls();
+ ash::test::AshTestBase::TearDownTestCase();
+ }
+};
namespace {

Powered by Google App Engine
This is Rietveld 408576698