Ensures that cold startup perf tests clear more DLLs. Helps bring results int...

chrome_frame/test/perf/chrome_frame_perftest.cc

 // Copyright (c) 2010 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 "chrome_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
@@ skipping 273 matching lines @@
   virtual void SetUp() {
     SetConfigBool(kChromeFrameUnpinnedMode, true);
     ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_));
 
     chrome_dll_ = dir_app_.Append(FILE_PATH_LITERAL("chrome.dll"));
     chrome_exe_ = dir_app_.Append(
         FilePath::FromWStringHack(chrome::kBrowserProcessExecutableName));
     chrome_frame_dll_ = dir_app_.Append(FILE_PATH_LITERAL("servers"));
     chrome_frame_dll_ = chrome_frame_dll_.Append(
         FilePath::FromWStringHack(kChromeFrameDllName));
-    DLOG(INFO) << __FUNCTION__ << ": " << chrome_frame_dll_.value();
+    icu_dll_ = dir_app_.Append(FILE_PATH_LITERAL("icudt42.dll"));
+    gears_dll_ = dir_app_.Append(FILE_PATH_LITERAL("gears.dll"));
+    avcodec52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avcodec-52.dll"));
+    avformat52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avformat-52.dll"));
+    avutil50_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avutil-50.dll"));
   }
   virtual void TearDown() {
     DeleteConfigValue(kChromeFrameUnpinnedMode);
   }
 
   // TODO(iyengar)
   // This function is similar to the RunStartupTest function used in chrome
   // startup tests. Refactor into a common implementation.
   void RunStartupTest(const char* graph, const char* trace,
                       const char* startup_url, bool test_cold,
                       int total_binaries, const FilePath binaries_to_evict[],
                       bool important, bool ignore_cache_error) {
     const int kNumCycles = 20;
 
     startup_url_ = startup_url;
 
     TimeDelta timings[kNumCycles];
 
     for (int i = 0; i < kNumCycles; ++i) {
       if (test_cold) {
         for (int binary_index = 0; binary_index < total_binaries;
              binary_index++) {
           bool result = EvictFileFromSystemCacheWrapper(
               binaries_to_evict[binary_index]);
           if (!ignore_cache_error) {
             ASSERT_TRUE(result);
           } else if (!result) {
+            LOG(ERROR) << GetLastError();
             printf("\nFailed to evict file %ls from cache. Not running test\n",
                    binaries_to_evict[binary_index].value().c_str());
             return;
           }
         }
       }
 
       TimeTicks start_time, end_time;
 
       RunStartupTestImpl(&start_time, &end_time);
@@ skipping 12 matching lines @@
     for (int i = 0; i < kNumCycles; ++i)
       StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
 
     PrintResultList(graph, "", trace, times, "ms", important);
   }
 
   FilePath dir_app_;
   FilePath chrome_dll_;
   FilePath chrome_exe_;
   FilePath chrome_frame_dll_;
+  FilePath icu_dll_;
+  FilePath gears_dll_;
+  FilePath avcodec52_dll_;
+  FilePath avformat52_dll_;
+  FilePath avutil50_dll_;
 
  protected:
   // Individual startup tests should implement this function.
   virtual void RunStartupTestImpl(TimeTicks* start_time,
                                   TimeTicks* end_time) {}
 
   // The host is torn down by this function. It should not be used after
   // this function returns.
   static void ReleaseHostComReferences(CAxWindow& host) {
     CComPtr<IAxWinHostWindow> spWinHost;
@@ skipping 553 matching lines @@
   RunStartupTest("warm", "t", "about:blank", false /* cold */, 0, NULL,
                  true /* important */, false);
 }
 
 TEST_F(ChromeFrameBinariesLoadTest, PerfWarm) {
   RunStartupTest("binary_load_warm", "t", "", false /* cold */, 0, NULL,
                  true /* important */, false);
 }
 
 TEST_F(ChromeFrameStartupTestActiveX, PerfCold) {
-  FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_, chrome_frame_dll_};
+  FilePath binaries_to_evict[] = { gears_dll_, avcodec52_dll_,
+      avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
+      chrome_frame_dll_};
   RunStartupTest("cold", "t", "about:blank", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* not important */, false);
 }
 
 TEST_F(ChromeFrameBinariesLoadTest, PerfCold) {
   FilePath binaries_to_evict[] = {chrome_exe_, chrome_dll_, chrome_frame_dll_};
   RunStartupTest("binary_load_cold", "t", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* not important */, false);
@@ skipping 125 matching lines @@
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* important */, true);
 }