Remove calls to ObserverList::size() from PluginInstaller.

(See issue for details on why this is being done).

BUG=278526
TEST=no change

Review URL: https://chromiumcodereview.appspot.com/22918027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219900 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 2 deletions

diff --git a/chrome/browser/plugins/plugin_installer.cc b/chrome/browser/plugins/plugin_installer.cc
index 099711e..6801d13 100644
--- a/chrome/browser/plugins/plugin_installer.cc
+++ b/chrome/browser/plugins/plugin_installer.cc
@@ -67,7 +67,8 @@ void BeginDownload(
 }  // namespace
 
 PluginInstaller::PluginInstaller()
-    : state_(INSTALLER_STATE_IDLE) {
+    : state_(INSTALLER_STATE_IDLE),
+      strong_observer_count_(0) {
 }
 
 PluginInstaller::~PluginInstaller() {
@@ -109,12 +110,14 @@ void PluginInstaller::OnDownloadDestroyed(DownloadItem* download) {
 }
 
 void PluginInstaller::AddObserver(PluginInstallerObserver* observer) {
+  strong_observer_count_++;
   observers_.AddObserver(observer);
 }
 
 void PluginInstaller::RemoveObserver(PluginInstallerObserver* observer) {
+  strong_observer_count_--;
   observers_.RemoveObserver(observer);
-  if (observers_.size() == weak_observers_.size()) {
+  if (strong_observer_count_ == 0) {
     FOR_EACH_OBSERVER(WeakPluginInstallerObserver, weak_observers_,
                       OnlyWeakObserversLeft());
   }
diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h
index 978fe1a..abcfe6f 100644
--- a/chrome/browser/plugins/plugin_installer.h
+++ b/chrome/browser/plugins/plugin_installer.h
@@ -58,6 +58,7 @@ class PluginInstaller : public content::DownloadItem::Observer {
 
   InstallerState state_;
   ObserverList<PluginInstallerObserver> observers_;
+  int strong_observer_count_;
   ObserverList<WeakPluginInstallerObserver> weak_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstaller);