ffmpeg chromium glue

chrome_frame/test/perf/chrome_frame_perftest.cc

Index: chrome_frame/test/perf/chrome_frame_perftest.cc
===================================================================
--- chrome_frame/test/perf/chrome_frame_perftest.cc	(revision 91003)
+++ chrome_frame/test/perf/chrome_frame_perftest.cc	(working copy)
@@ -295,9 +295,9 @@
     chrome_frame_dll_ = dir_app_.Append(L"servers");
     chrome_frame_dll_ = chrome_frame_dll_.Append(kChromeFrameDllName);
     icu_dll_ = dir_app_.Append(L"icudt.dll");
-    avcodec52_dll_ = dir_app_.Append(L"avcodec-52.dll");
-    avformat52_dll_ = dir_app_.Append(L"avformat-52.dll");
-    avutil50_dll_ = dir_app_.Append(L"avutil-50.dll");
+    avcodec_dll_ = dir_app_.Append(L"avcodec-53.dll");
+    avformat_dll_ = dir_app_.Append(L"avformat-53.dll");
+    avutil_dll_ = dir_app_.Append(L"avutil-51.dll");
   }
 
   // TODO(iyengar)
@@ -355,9 +355,9 @@
   FilePath chrome_exe_;
   FilePath chrome_frame_dll_;
   FilePath icu_dll_;
-  FilePath avcodec52_dll_;
-  FilePath avformat52_dll_;
-  FilePath avutil50_dll_;
+  FilePath avcodec_dll_;
+  FilePath avformat_dll_;
+  FilePath avutil_dll_;
 
  protected:
   // Individual startup tests should implement this function.
@@ -964,7 +964,7 @@
 TEST_F(ChromeFrameStartupTestActiveX, PerfCold) {
   SetConfigInt(L"PreRead", 0);
   FilePath binaries_to_evict[] = {
-    avcodec52_dll_, avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
+    avcodec_dll_, avformat_dll_, avutil_dll_, chrome_exe_, chrome_dll_,
     chrome_frame_dll_
   };
   RunStartupTest("cold", "t", "about:blank", true /* cold */,
@@ -976,7 +976,7 @@
 TEST_F(ChromeFrameStartupTestActiveX, PerfColdPreRead) {
   SetConfigInt(L"PreRead", 1);
   FilePath binaries_to_evict[] = {
-    avcodec52_dll_, avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
+    avcodec_dll_, avformat_dll_, avutil_dll_, chrome_exe_, chrome_dll_,
     chrome_frame_dll_
   };
   RunStartupTest("cold_preread", "t", "about:blank", true /* cold */,