Remove WebMediaPlayerDelegate null checks

content/renderer/media/android/webmediaplayer_android.h

 // Copyright 2013 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_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 64 matching lines @@
   // Construct a WebMediaPlayerAndroid object. This class communicates with the
   // MediaPlayerAndroid object in the browser process through |proxy|.
   // TODO(qinmin): |frame| argument is used to determine whether the current
   // player can enter fullscreen. This logic should probably be moved into
   // blink, so that enteredFullscreen() will not be called if another video is
   // already in fullscreen.
   WebMediaPlayerAndroid(
       blink::WebFrame* frame,
       blink::WebMediaPlayerClient* client,
       blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
-      base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
+      media::WebMediaPlayerDelegate* delegate,
       RendererMediaPlayerManager* player_manager,
       scoped_refptr<StreamTextureFactory> factory,
       int frame_id,
       bool enable_texture_copy,
       const media::WebMediaPlayerParams& params);
   ~WebMediaPlayerAndroid() override;
 
   // blink::WebMediaPlayer implementation.
   bool supportsOverlayFullscreenVideo() override;
   void enteredFullscreen() override;
@@ skipping 174 matching lines @@
   bool IsBackgroundVideoCandidate() const;
 
   blink::WebFrame* const frame_;
 
   blink::WebMediaPlayerClient* const client_;
 
   // WebMediaPlayer notifies the |delegate_| of playback state changes using
   // |delegate_id_|; an id provided after registering with the delegate.  The
   // WebMediaPlayer may also receive directives (play, pause) from the delegate
   // via the WebMediaPlayerDelegate::Observer interface after registration.
-  base::WeakPtr<media::WebMediaPlayerDelegate> delegate_;
+  media::WebMediaPlayerDelegate* delegate_;

[clamy, 2017/01/18 13:56:16]

Could you add a comment describing why this is safe to store as a naked pointer?
This is far from obvious and it would help readers. Thanks!

Same in other header files.

[tguilbert, 2017/01/19 02:39:12]

Done.

   int delegate_id_;
 
   // Callback responsible for determining if loading of media should be deferred
   // for external reasons; called during load().
   media::WebMediaPlayerParams::DeferLoadCB defer_load_cb_;
 
   // Save the list of buffered time ranges.
   blink::WebTimeRanges buffered_;
 
   // Size of the video.
@@ skipping 134 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_