Fix ProfileManagerTest.CreateProfileAsync failures on cros.

chrome/test/testing_browser_process.cc

 // Copyright (c) 2011 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/testing_browser_process.h"
 
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
@@ skipping 219 matching lines @@
   return NULL;
 }
 
 prerender::PrerenderTracker* TestingBrowserProcess::prerender_tracker() {
   if (!prerender_tracker_.get())
     prerender_tracker_.reset(new prerender::PrerenderTracker());
   return prerender_tracker_.get();
 }
 
 void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
+  if (!local_state && notification_ui_manager_.get())
+    notification_ui_manager_.reset();  // Used local_state_.

[Scott Hess - ex-Googler, 2011/06/08 16:43:43]

Wouldn't this (potentially) apply in any case where local_state != local_state_?

[jam, 2011/06/08 16:48:27]

I thought about trying to add fancier checks initially.  But if someone changes
the PrefsService, which doesn't happen now, I would guess that other stuff
breaks as is.  So I decided to do the minimal fix.  Note that the tests now are
into varieties: create (one) prefsservice or not.  The prefsservice must have
been set before NotificationUIManager is created, since it uses it in its
construction.  So if notification_ui_manager_ is set, we know that local_state_
must have been set.

   local_state_ = local_state;
 }
 
 void TestingBrowserProcess::SetGoogleURLTracker(
     GoogleURLTracker* google_url_tracker) {
   google_url_tracker_.reset(google_url_tracker);
 }
 
 ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
@@ skipping 10 matching lines @@
 
 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
   DCHECK_EQ(browser_process_.get(), g_browser_process);
 
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // After the transition is over, we should just
   // reset |g_browser_process| to NULL.
   browser_process_.reset();
   g_browser_process = new TestingBrowserProcess();
 }