Change MediaStreamCaptureIndicator back to ref counted

chrome/browser/media/media_stream_capture_indicator.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
 
 #include <string>
 #include <vector>
 
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "content/public/common/media_stream_request.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image_skia.h"
 
 class StatusIcon;
 class StatusTray;
 
 // This indicator is owned by MediaInternals and deleted when MediaInternals
 // is deleted.
-class MediaStreamCaptureIndicator : public ui::SimpleMenuModel::Delegate,
-                                    public ImageLoadingTracker::Observer {
+class MediaStreamCaptureIndicator
+    : public base::RefCountedThreadSafe<MediaStreamCaptureIndicator>,
+      public ui::SimpleMenuModel::Delegate,
+      public ImageLoadingTracker::Observer {
  public:
   MediaStreamCaptureIndicator();
-  virtual ~MediaStreamCaptureIndicator();
 
   // Overrides from SimpleMenuModel::Delegate implementation.
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
   // Called on IO thread when MediaStream opens new capture devices.
@@ skipping 39 matching lines @@
     TabEquals(int render_process_id, int render_view_id);
 
     bool operator() (
         const MediaStreamCaptureIndicator::CaptureDeviceTab& tab);
 
    private:
     int render_process_id_;
     int render_view_id_;
   };
 
+  friend class base::RefCountedThreadSafe<MediaStreamCaptureIndicator>;
+  virtual ~MediaStreamCaptureIndicator();
+
   // Called by the public functions, executed on UI thread.
   void DoDevicesOpenedOnUIThread(int render_process_id,
                                  int render_view_id,
                                  const content::MediaStreamDevices& devices);
   void DoDevicesClosedOnUIThread(int render_process_id,
                                  int render_view_id,
                                  const content::MediaStreamDevices& devices);
 
   // Following functions/variables are executed/accessed only on UI thread.
   // Creates the status tray if it has not been created.
@@ skipping 46 matching lines @@
   typedef std::vector<CaptureDeviceTab> CaptureDeviceTabs;
   CaptureDeviceTabs tabs_;
 
   // Tracks the load of extension icons.
   scoped_ptr<ImageLoadingTracker> tracker_;
   // The messages to display when extension images are loaded. The index
   // corresponds to the index of the associated LoadImage request.
   std::map<int, string16> pending_messages_;
   // Tracks the number of requests to |tracker_|.
   int request_index_;
-
-  base::WeakPtrFactory<MediaStreamCaptureIndicator> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaStreamCaptureIndicator);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_