Second batch of fixing prefs registrations.

chrome/browser/ui/views/browser_actions_container.cc

Index: chrome/browser/ui/views/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 0d84413ede2df072ea62f0696cd1e203ad2a348d..8717530f39391aee92d4544a5ead547f016effe4 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
@@ -47,12 +46,6 @@ const int kItemSpacing = ToolbarView::kStandardSpacing;
 // Horizontal spacing before the chevron (if visible).
 const int kChevronSpacing = kItemSpacing - 2;
 
-void RegisterUserPrefs(PrefRegistrySyncable* registry) {
-  registry->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,
-                                0,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-
 }  // namespace
 
 // static
@@ -119,14 +112,6 @@ BrowserActionsContainer::~BrowserActionsContainer() {
 void BrowserActionsContainer::Init() {
   LoadImages();
 
-  // TODO(joi): Switch to official way of registering user prefs for
-  // this class, i.e. in a function called from
-  // browser_prefs::RegisterUserPrefs.
-  if (!profile_->GetPrefs()->FindPreference(
-          prefs::kBrowserActionContainerWidth))
-    RegisterUserPrefs(static_cast<PrefRegistrySyncable*>(
-        profile_->GetPrefs()->DeprecatedGetPrefRegistry()));
-
   // We wait to set the container width until now so that the chevron images
   // will be loaded.  The width calculation needs to know the chevron size.
   if (model_ &&