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

Unified Diff: chrome/browser/extensions/extension_context_menu_model_unittest.cc

Issue 950053002: Cache the Windows Parental Controls Platform Answer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unit Test Fixes 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/extensions/extension_context_menu_model_unittest.cc
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 16fb6959e5f16f54ce39ab696b0ac43f10958027..cc99603bab1a0a7fd7e0a4309e213c5ffd24b3a5 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -27,6 +27,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
+#if defined(OS_WIN)
+#include "chrome/browser/prefs/incognito_mode_prefs.h"
+#endif // defined(OS_WIN)
+
namespace extensions {
namespace {
@@ -49,6 +53,10 @@ scoped_refptr<const Extension> BuildExtension(const std::string& name,
// Create a Browser for the ExtensionContextMenuModel to use.
scoped_ptr<Browser> CreateBrowser(Profile* profile) {
+#if defined(OS_WIN)
+ IncognitoModePrefs::InitializePlatformParentalControls();
gab 2015/02/25 20:23:52 IMO this belongs in SetUpTestCase() in the test fi
robliao 2015/02/26 21:03:51 Done for test classes. Global calls like chrome::C
+#endif // defined(OS_WIN)
+
Browser::CreateParams params(profile, chrome::GetActiveDesktop());
TestBrowserWindow test_window;
params.window = &test_window;
« no previous file with comments | « no previous file | chrome/browser/prefs/incognito_mode_prefs.h » ('j') | chrome/browser/profiles/profile_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698