Get rid of browser_prefs::RegisterAllPrefs()

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

 // 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"
 
 #include <algorithm>
 
 #include "ui/base/l10n/l10n_util.h"
 #include "base/logging.h"
@@ skipping 816 matching lines @@
 - (NSArray*)toolbarSelectableItemIdentifiers:(NSToolbar*)toolbar {
   DCHECK(toolbar == toolbar_);
   return [[toolbar_ items] valueForKey:@"itemIdentifier"];
 }
 
 // Register our interest in the preferences we're displaying so if anything
 // else in the UI changes them we will be updated.
 - (void)registerPrefObservers {
   if (!prefs_) return;
 
-  // During unit tests, there is no local state object, so we fall back to
-  // the prefs object (where we've explicitly registered this pref so we
-  // know it's there).
   PrefService* local = g_browser_process->local_state();
-  if (!local)
-    local = prefs_;
 
   // Basics panel
   registrar_.Init(prefs_);
   registrar_.Add(prefs::kURLsToRestoreOnStartup, observer_.get());
   restoreOnStartup_.Init(prefs::kRestoreOnStartup, prefs_, observer_.get());
   newTabPageIsHomePage_.Init(prefs::kHomePageIsNewTabPage,
                              prefs_, observer_.get());
   homepage_.Init(prefs::kHomePage, prefs_, observer_.get());
   showHomeButton_.Init(prefs::kShowHomeButton, prefs_, observer_.get());
   instantEnabled_.Init(prefs::kInstantEnabled, prefs_, observer_.get());
@@ skipping 1206 matching lines @@
   DCHECK_EQ(animation_.get(), animation);
   // Animation finished, reset subviews to current prefs view and the banner.
   [self resetSubViews];
 }
 
 // Reinitializes the banner state tracker object to watch for managed bits of
 // preferences relevant to the given options |page|.
 - (void)initBannerStateForPage:(OptionsPage)page {
   page = [self normalizePage:page];
 
-  // During unit tests, there is no local state object, so we fall back to
-  // the prefs object (where we've explicitly registered this pref so we
-  // know it's there).
-  PrefService* local = g_browser_process->local_state();
-  if (!local)
-    local = prefs_;
   bannerState_.reset(
       new PreferencesWindowControllerInternal::ManagedPrefsBannerState(
-          self, page, local, prefs_));
+          self, page, g_browser_process->local_state(), prefs_));
 }
 
 - (void)switchToPage:(OptionsPage)page animate:(BOOL)animate {
   [self displayPreferenceViewForPage:page animate:animate];
   NSToolbarItem* toolbarItem = [self getToolbarItemForPage:page];
   [toolbar_ setSelectedItemIdentifier:[toolbarItem itemIdentifier]];
 }
 
 // Called when the window is being closed. Send out a notification that the user
 // is done editing preferences. Make sure there are no pending field editors
@@ skipping 90 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end