Get rid of browser_prefs::RegisterAllPrefs()

chrome/browser/ui/cocoa/options/preferences_window_controller_unittest.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #import "chrome/browser/ui/cocoa/options/preferences_window_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
+#include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/options/custom_home_pages_model.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/testing_browser_process.h"
+#include "chrome/test/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // Helper Objective-C object that sets a BOOL when we get a particular
 // callback from the prefs window.
 @interface PrefsClosedObserver : NSObject {
  @public
   BOOL gotNotification_;
 }
 - (void)prefsWindowClosed:(NSNotification*)notify;
 @end
 
 @implementation PrefsClosedObserver
 - (void)prefsWindowClosed:(NSNotification*)notify {
   gotNotification_ = YES;
 }
 @end
 
 namespace {
 
 class PrefsControllerTest : public CocoaTest {
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
-    // The metrics reporting pref is registerd on the local state object in
-    // real builds, but we don't have one of those for unit tests. Register
-    // it on prefs so we'll find it when we go looking.
-    PrefService* prefs = browser_helper_.profile()->GetPrefs();
-    prefs->RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
+    browser::RegisterLocalState(&local_state_);
+    local_state_.RegisterBooleanPref(prefs::kMetricsReportingEnabled, false);
+    browser_process_.get()->SetPrefService(&local_state_);

[Paweł Hajdan Jr., 2011/02/18 17:03:43]

Just use g_browser_process here.

[Mattias Nissler (ping if slow), 2011/02/18 17:08:04]

That won't work, since the SetPrefService is a special helper for testing. It
doesn't exist on BrowserProcess, but only TestingBrowserProcess. So working with
g_browser_process I'd have to cast, which I think is good to avoid. Also, what's
the problem with having a scoped browser process and being able to configure it
for testing?

 
     pref_controller_ = [[PreferencesWindowController alloc]
                          initWithProfile:browser_helper_.profile()
                              initialPage:OPTIONS_PAGE_DEFAULT];
     EXPECT_TRUE(pref_controller_);
   }
 
   virtual void TearDown() {
     [pref_controller_ close];
     CocoaTest::TearDown();
   }
 
+  ScopedTestingBrowserProcess browser_process_;
+  TestingPrefService local_state_;
   BrowserTestHelper browser_helper_;
   PreferencesWindowController* pref_controller_;
 };
 
 // Test showing the preferences window and making sure it's visible, then
 // making sure we get the notification when it's closed.
 TEST_F(PrefsControllerTest, ShowAndClose) {
   [pref_controller_ showPreferences:nil];
   EXPECT_TRUE([[pref_controller_ window] isVisible]);
 
@@ skipping 165 matching lines @@
 
   // TODO(akalin): Figure out how to test animation; we'll need everything
   // to stick around until the animation finishes.
 }
 
 // TODO(akalin): Figure out how to test sync controls.
 // TODO(akalin): Figure out how to test that sync controls are not shown
 // when there isn't a sync service.
 
 }  // namespace