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

Unified Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix/Extend NetworkConfigurationUpdater unit test. Created 7 years, 1 month 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/website_settings/website_settings_unittest.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index ab5cba02b6572aeb3c8ecef820c243a5b744327c..134678ed40a0f4db9c0432974ada54ddf194e184 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -28,6 +28,10 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
+#endif
+
using content::SSLStatus;
using testing::_;
using testing::AnyNumber;
@@ -81,6 +85,12 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
virtual void SetUp() {
ChromeRenderViewHostTestHarness::SetUp();
+
+#if defined(OS_CHROMEOS)
+ policy::NetworkPolicyServiceFactory::GetInstance()->SetTestingFactory(
+ profile(), NULL);
+#endif
Joao da Silva 2013/11/11 12:38:19 Same
pneubeck (no reviews) 2013/11/12 10:07:53 Done.
+
// Setup stub SSLStatus.
ssl_.security_style = content::SECURITY_STYLE_UNAUTHENTICATED;

Powered by Google App Engine
This is Rietveld 408576698