Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/ui/website_settings/website_settings_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include "base/at_exit.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 10 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "net/test/test_certificate_data.h"
 #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;
 using testing::Return;
 using testing::SetArgPointee;
 
 namespace {
 
 // SSL cipher suite like specified in RFC5246 Appendix A.5. "The Cipher Suite".
 // Without the CR_ prefix, this clashes with the OS X 10.8 headers.
@@ skipping 33 matching lines @@
 
 class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
   WebsiteSettingsTest() : cert_id_(0), url_("http://www.example.com") {}
 
   virtual ~WebsiteSettingsTest() {
   }
 
   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;
 
     // Create the certificate.
     cert_id_ = 1;
     base::Time start_date = base::Time::Now();
     base::Time expiration_date = base::Time::FromInternalValue(
         start_date.ToInternalValue() + base::Time::kMicrosecondsPerWeek);
     cert_ = new net::X509Certificate("subject",
                                      "issuer",
@@ skipping 296 matching lines @@
       CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
   website_settings()->OnUIClosing();
   ASSERT_EQ(1u, infobar_service()->infobar_count());
 
   // Removing an |InfoBarDelegate| from the |InfoBarService| does not delete
   // it. Hence the |delegate| must be cleaned up after it was removed from the
   // |infobar_service|.
   scoped_ptr<InfoBarDelegate> delegate(infobar_service()->infobar_at(0));
   infobar_service()->RemoveInfoBar(delegate.get());
 }