Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail.

chrome/test/base/testing_browser_process.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/test/base/testing_browser_process.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "ui/base/clipboard/clipboard.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/clipboard/clipboard.h"
 
 #if !defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/policy_service_stub.h"
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
 TestingBrowserProcess::TestingBrowserProcess()
     : notification_service_(content::NotificationService::Create()),
       module_ref_count_(0),
       app_locale_("en"),
       local_state_(NULL),
@@ skipping 35 matching lines @@
 }
 
 chrome_variations::VariationsService*
     TestingBrowserProcess::variations_service() {
   return NULL;
 }
 
 policy::BrowserPolicyConnector*
     TestingBrowserProcess::browser_policy_connector() {
 #if defined(ENABLE_CONFIGURATION_POLICY)
-  if (!browser_policy_connector_.get()) {
+  if (!browser_policy_connector_.get())
     browser_policy_connector_.reset(new policy::BrowserPolicyConnector());
-    browser_policy_connector_->Init();
-  }
 #endif
   return browser_policy_connector_.get();
 }
 
 policy::PolicyService* TestingBrowserProcess::policy_service() {
   if (!policy_service_.get()) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
-    policy_service_ = browser_policy_connector()->CreatePolicyService(NULL);
+    policy_service_.reset(
+        browser_policy_connector()->CreatePolicyService(NULL));
 #else
     policy_service_.reset(new policy::PolicyServiceStub());
 #endif
   }
   return policy_service_.get();
 }
 
 IconManager* TestingBrowserProcess::icon_manager() {
   return NULL;
 }
@@ skipping 145 matching lines @@
 
 ComponentUpdateService* TestingBrowserProcess::component_updater() {
   return NULL;
 }
 
 CRLSetFetcher* TestingBrowserProcess::crl_set_fetcher() {
   return NULL;
 }
 
 void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
-  if (!local_state) {
-    // The local_state_ PrefService is owned outside of TestingBrowserProcess,
-    // but some of the members of TestingBrowserProcess hold references to it
-    // (for example, via PrefNotifier members). But given our test
-    // infrastructure which tears down individual tests before freeing the
-    // TestingBrowserProcess, there's not a good way to make local_state outlive
-    // these dependencies. As a workaround, whenever local_state_ is cleared
-    // (assumedly as part of exiting the test and freeing TestingBrowserProcess)
-    // any components owned by TestingBrowserProcess that depend on local_state
-    // are also freed.
-    notification_ui_manager_.reset();
-    browser_policy_connector_.reset();
-  }
+  if (!local_state && notification_ui_manager_.get())
+    notification_ui_manager_.reset();  // Used local_state_.
   local_state_ = local_state;
 }
 
 void TestingBrowserProcess::SetIOThread(IOThread* io_thread) {
   io_thread_ = io_thread;
 }
 
 void TestingBrowserProcess::SetBrowserPolicyConnector(
     policy::BrowserPolicyConnector* connector) {
   browser_policy_connector_.reset(connector);
 }
 
 void TestingBrowserProcess::SetSafeBrowsingService(
     SafeBrowsingService* sb_service) {
   sb_service_ = sb_service;
 }