Fix an issue that a browser seek is requested after decoder draining is interrupted.

media/base/android/media_source_player_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 1944 matching lines @@
   EXPECT_FALSE(IsDrainingDecoder(true));
 
   EXPECT_FALSE(GetMediaCodecBridge(true));
   EXPECT_FALSE(player_.IsPlaying());
 
   player_.Start();
   EXPECT_TRUE(player_.IsPlaying());
   EXPECT_EQ(3, demuxer_->num_data_requests());
 }
 
-TEST_F(MediaSourcePlayerTest, DISABLED_DecoderDrainInterruptedBySurfaceChange) {
+TEST_F(MediaSourcePlayerTest, DecoderDrainInterruptedBySurfaceChange) {
   SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
 
   // Test if a video decoder is being drained while surface changes, draining
   // is canceled.
   SendConfigChangeToDecoder(false, false, 0, false);
   EXPECT_TRUE(IsDrainingDecoder(false));
 
   CreateNextTextureAndSetVideoSurface();
   WaitForVideoDecodeDone();
 
@@ skipping 346 matching lines @@
   // Wait for the metadata change.
   while(manager_.num_metadata_changes() == 1) {
     player_.OnDemuxerDataAvailable(data);
     WaitForVideoDecodeDone();
   }
   EXPECT_EQ(2, manager_.num_metadata_changes());
   WaitForVideoDecodeDone();
 }
 
 }  // namespace media