Fix cyclic dependency between ProfilePolicyConnector and PrefService.

chrome/browser/ui/toolbar/toolbar_model_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/toolbar/toolbar_model.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/escape.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
+#endif
 
 // Test data ------------------------------------------------------------------
 
 namespace {
 
 struct TestItem {
   GURL url;
   string16 expected_text;
   // The expected text to display when query extraction is inactive.
   string16 expected_replace_text_inactive;
@@ skipping 133 matching lines @@
 };
 
 ToolbarModelTest::ToolbarModelTest() {
 }
 
 ToolbarModelTest::~ToolbarModelTest() {
 }
 
 void ToolbarModelTest::SetUp() {
   BrowserWithTestWindowTest::SetUp();
+
+#if defined(OS_CHROMEOS)
+  policy::NetworkPolicyServiceFactory::GetInstance()->SetTestingFactory(
+      profile(), NULL);
+#endif

[Joao da Silva, 2013/11/11 12:38:19]

Isn't it cleaner to override ServiceIsNULLWhileTesting() at the factory?

[pneubeck (no reviews), 2013/11/12 10:07:53]

Done.

+
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &AutocompleteClassifierFactory::BuildInstanceFor);
   UIThreadSearchTermsData::SetGoogleBaseURL("http://google.com/");
 }
 
 void ToolbarModelTest::ResetDefaultTemplateURL() {
   ResetTemplateURLForInstant(GURL("http://does/not/exist"));
 }
@@ skipping 158 matching lines @@
   // The same URL, when specified on the command line, should allow search term
   // extraction.
   UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
                                                       "http://www.foo.com/");
   NavigateAndCheckText(
       GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
       ASCIIToUTF16("www.foo.com/search?q=tractor+supply&espv=1"),
       ASCIIToUTF16("tractor supply"), true, true);
 }