Rename CallbackRegistry to CallbackList

chrome/browser/user_style_sheet_watcher.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/browser/user_style_sheet_watcher.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 39 matching lines @@
 
   GURL user_style_sheet() const {
     return user_style_sheet_;
   }
 
   // Load the user style sheet on the file thread and convert it to a
   // base64 URL.  Posts the base64 URL back to the UI thread.
   void LoadStyleSheet(const base::FilePath& style_sheet_file);
 
   // Register a callback to be called whenever the stylesheet gets updated.
-  scoped_ptr<base::CallbackRegistry<void(void)>::Subscription>
+  scoped_ptr<base::CallbackList<void(void)>::Subscription>
   RegisterOnStyleSheetUpdatedCallback(const base::Closure& callback);
 
   // Send out a notification if the stylesheet has already been loaded.
   void NotifyLoaded();
 
   // FilePathWatcher::Callback method:
   void NotifyPathChanged(const base::FilePath& path, bool error);
 
  private:
   friend class base::RefCountedThreadSafe<UserStyleSheetLoader>;
   ~UserStyleSheetLoader();
 
   // Called on the UI thread after the stylesheet has loaded.
   void SetStyleSheet(const GURL& url);
 
   // The user style sheet as a base64 data:// URL.
   GURL user_style_sheet_;
 
   // Whether the stylesheet has been loaded.
   bool has_loaded_;
 
-  base::CallbackRegistry<void(void)> style_sheet_updated_callbacks_;
+  base::CallbackList<void(void)> style_sheet_updated_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(UserStyleSheetLoader);
 };
 
 UserStyleSheetLoader::UserStyleSheetLoader()
     : has_loaded_(false) {
 }
 
 UserStyleSheetLoader::~UserStyleSheetLoader() {
 }
 
-scoped_ptr<base::CallbackRegistry<void(void)>::Subscription>
+scoped_ptr<base::CallbackList<void(void)>::Subscription>
 UserStyleSheetLoader::RegisterOnStyleSheetUpdatedCallback(
     const base::Closure& callback) {
   return style_sheet_updated_callbacks_.Add(callback);
 }
 
 void UserStyleSheetLoader::NotifyLoaded() {
   if (has_loaded_) {
     style_sheet_updated_callbacks_.Notify();
   }
 }
@@ skipping 80 matching lines @@
       LOG(ERROR) << "Failed to setup watch for " << style_sheet_file.value();
     }
     loader_->LoadStyleSheet(style_sheet_file);
   }
 }
 
 GURL UserStyleSheetWatcher::user_style_sheet() const {
   return loader_->user_style_sheet();
 }
 
-scoped_ptr<base::CallbackRegistry<void(void)>::Subscription>
+scoped_ptr<base::CallbackList<void(void)>::Subscription>
 UserStyleSheetWatcher::RegisterOnStyleSheetUpdatedCallback(
     const base::Closure& callback) {
   return loader_->RegisterOnStyleSheetUpdatedCallback(callback);
 }
 
 void UserStyleSheetWatcher::Observe(int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED);
   if (profile_->IsSameProfile(Profile::FromBrowserContext(
           content::Source<WebContents>(source)->GetBrowserContext()))) {
     loader_->NotifyLoaded();
     registrar_.RemoveAll();
   }
 }
 
 void UserStyleSheetWatcher::ShutdownOnUIThread() {
   registrar_.RemoveAll();
 }