Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Side by Side Diff: chrome_frame/test/perf/chrome_frame_perftest.cc

Issue 9317096: Fix media code to work with new ffmpeg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix deprecated methods. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "chrome_frame/test/perf/chrome_frame_perftest.h" 4 #include "chrome_frame/test/perf/chrome_frame_perftest.h"
5 5
6 #include <atlwin.h> 6 #include <atlwin.h>
7 #include <atlhost.h> 7 #include <atlhost.h>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 #include <string> 10 #include <string>
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 public: 287 public:
288 ChromeFrameStartupTest() {} 288 ChromeFrameStartupTest() {}
289 289
290 virtual void SetUp() { 290 virtual void SetUp() {
291 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_)); 291 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_));
292 292
293 chrome_dll_ = dir_app_.Append(L"chrome.dll"); 293 chrome_dll_ = dir_app_.Append(L"chrome.dll");
294 chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName); 294 chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName);
295 chrome_frame_dll_ = dir_app_.Append(kChromeFrameDllName); 295 chrome_frame_dll_ = dir_app_.Append(kChromeFrameDllName);
296 icu_dll_ = dir_app_.Append(L"icudt.dll"); 296 icu_dll_ = dir_app_.Append(L"icudt.dll");
297 avcodec_dll_ = dir_app_.Append(L"avcodec-53.dll"); 297 avcodec_dll_ = dir_app_.Append(L"avcodec-54.dll");
298 avformat_dll_ = dir_app_.Append(L"avformat-53.dll"); 298 avformat_dll_ = dir_app_.Append(L"avformat-54.dll");
299 avutil_dll_ = dir_app_.Append(L"avutil-51.dll"); 299 avutil_dll_ = dir_app_.Append(L"avutil-51.dll");
300 } 300 }
301 301
302 // TODO(iyengar) 302 // TODO(iyengar)
303 // This function is similar to the RunStartupTest function used in chrome 303 // This function is similar to the RunStartupTest function used in chrome
304 // startup tests. Refactor into a common implementation. 304 // startup tests. Refactor into a common implementation.
305 void RunStartupTest(const char* graph, const char* trace, 305 void RunStartupTest(const char* graph, const char* trace,
306 const char* startup_url, bool test_cold, 306 const char* startup_url, bool test_cold,
307 int total_binaries, const FilePath binaries_to_evict[], 307 int total_binaries, const FilePath binaries_to_evict[],
308 bool important, bool ignore_cache_error) { 308 bool important, bool ignore_cache_error) {
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1468 PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles, 1468 PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles,
1469 "automationproviderconnect"); 1469 "automationproviderconnect");
1470 PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles, 1470 PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles,
1471 "externaltabnavigate"); 1471 "externaltabnavigate");
1472 PrintPerfTestResults(renderer_main_monitor, kNumCycles, 1472 PrintPerfTestResults(renderer_main_monitor, kNumCycles,
1473 "beginrenderermain"); 1473 "beginrenderermain");
1474 #ifdef NDEBUG 1474 #ifdef NDEBUG
1475 PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage"); 1475 PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage");
1476 #endif // NDEBUG 1476 #endif // NDEBUG
1477 } 1477 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698