Extend scoped_ptr to be closer to unique_ptr. Support custom deleters, and deleting arrays.

content/browser/speech/speech_recognition_manager_impl.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 CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 81 matching lines @@
   virtual void OnRecognitionResult(
       int session_id, const content::SpeechRecognitionResult& result) OVERRIDE;
   virtual void OnRecognitionError(
       int session_id, const content::SpeechRecognitionError& error) OVERRIDE;
   virtual void OnAudioLevelsChange(int session_id, float volume,
                                    float noise_volume) OVERRIDE;
 
  protected:
   // BrowserMainLoop is the only one allowed to istantiate and free us.
   friend class content::BrowserMainLoop;
-  friend class scoped_ptr<SpeechRecognitionManagerImpl>;  // Needed for dtor.
+
+  // Needed for dtor.
+  friend struct base::DefaultDeleter<SpeechRecognitionManagerImpl>;
+
   SpeechRecognitionManagerImpl();
   virtual ~SpeechRecognitionManagerImpl();
 
  private:
   // Data types for the internal Finite State Machine (FSM).
   enum FSMState {
     SESSION_STATE_IDLE = 0,
     SESSION_STATE_CAPTURING_AUDIO,
     SESSION_STATE_WAITING_FOR_RESULT,
     SESSION_STATE_MAX_VALUE = SESSION_STATE_WAITING_FOR_RESULT
@@ skipping 64 matching lines @@
 
 #if !defined(OS_IOS)
   class PermissionRequest;
   scoped_ptr<PermissionRequest> permission_request_;
 #endif  // !defined(OS_IOS)
 };
 
 }  // namespace speech
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_MANAGER_IMPL_H_