Fix broken SurfaceView usage on < M devices.

media/filters/gpu_video_decoder.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 MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_GPU_VIDEO_DECODER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 145 matching lines @@
   void DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent() const;
 
   // Provided to the |request_surface_cb_| callback given during construction;
   // sets or changes the output surface.
   void OnSurfaceAvailable(int surface_id);
 
   // If the VDA supports external surfaces, we must wait for the surface before
   // completing initialization. This will be called by OnSurfaceAvailable() once
   // the surface is known or immediately by Initialize() if external surfaces
   // are unsupported.
-  void CompleteInitialization();
+  void CompleteInitialization(int surface_id);
 
   bool needs_bitstream_conversion_;
 
   GpuVideoAcceleratorFactories* factories_;
 
   // For requesting a suface to render to. If this is null the VDA will return
   // normal video frames and not render them to a surface.
   RequestSurfaceCB request_surface_cb_;
 
   scoped_refptr<MediaLog> media_log_;
@@ skipping 82 matching lines @@
   // Bound to factories_->GetMessageLoop().
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<GpuVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_GPU_VIDEO_DECODER_H_