Introduce CancelUponDeferral() to buffered media loaders.

media/blink/run_all_unittests.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #endif
 
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA
+#include "gin/public/isolate_holder.h"
+#endif
+
 class TestBlinkPlatformSupport : NON_EXPORTED_BASE(public blink::Platform) {
  public:
   virtual ~TestBlinkPlatformSupport();
 
   virtual void cryptographicallyRandomValues(unsigned char* buffer,
                                              size_t length) override;
   virtual const unsigned char* getTraceCategoryEnabledFlag(
       const char* categoryName) override;
 };
 
@@ skipping 38 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   // Needed for surface texture support.
   ui::gl::android::RegisterJni(env);
   media::RegisterJni(env);
 #endif
 
   // Run this here instead of main() to ensure an AtExitManager is already
   // present.
   media::InitializeMediaLibraryForTesting();
 
+#ifdef V8_USE_EXTERNAL_STARTUP_DATA
+    gin::IsolateHolder::LoadV8Snapshot();
+#endif
+
   blink::initialize(blink_platform_support_.get());
 }
 
 int main(int argc, char** argv) {
   BlinkMediaTestSuite test_suite(argc, argv);
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&BlinkMediaTestSuite::Run,
                              base::Unretained(&test_suite)));
 }