1 files changed, 10 insertions, 17 deletions

diff --git a/video_engine/vie_shared_data.h b/video_engine/vie_shared_data.h
index 4b288868..19f2ebfa 100644
--- a/video_engine/vie_shared_data.h
+++ b/video_engine/vie_shared_data.h
@@ -14,7 +14,7 @@
 #ifndef WEBRTC_VIDEO_ENGINE_VIE_SHARED_DATA_H_
 #define WEBRTC_VIDEO_ENGINE_VIE_SHARED_DATA_H_
 
-#include "video_engine/vie_defines.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {
 
@@ -26,32 +26,25 @@ class ViERenderManager;
 
 class ViESharedData {
  public:
-  ViESharedData(const Config& config);
+  explicit ViESharedData(const Config& config);
   ~ViESharedData();
 
-  bool Initialized() const;
-  int SetInitialized();
-  int SetUnInitialized();
   void SetLastError(const int error) const;
   int LastErrorInternal() const;
-  void SetOverUseDetectorOptions(const OverUseDetectorOptions& options);
   int NumberOfCores() const;
 
-  int instance_id() { return instance_id_;}
-  ViEChannelManager* channel_manager() { return &channel_manager_; }
-  ViEInputManager* input_manager() { return &input_manager_; }
-  ViERenderManager* render_manager() { return &render_manager_; }
+  // TODO(mflodman) Remove all calls to 'instance_id()'.
+  int instance_id() { return 0;}
+  ViEChannelManager* channel_manager() { return channel_manager_.get(); }
+  ViEInputManager* input_manager() { return input_manager_.get(); }
+  ViERenderManager* render_manager() { return render_manager_.get(); }
 
  private:
-  static int instance_counter_;
-  const int instance_id_;
-  bool initialized_;
   const int number_cores_;
 
-  OverUseDetectorOptions over_use_detector_options_;
-  ViEChannelManager& channel_manager_;
-  ViEInputManager& input_manager_;
-  ViERenderManager& render_manager_;
+  scoped_ptr<ViEChannelManager> channel_manager_;
+  scoped_ptr<ViEInputManager> input_manager_;
+  scoped_ptr<ViERenderManager> render_manager_;
   ProcessThread* module_process_thread_;
   mutable int last_error_;
 };