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

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 years. 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
« no previous file with comments | « chrome/tools/build/win/FILES.cfg ('k') | media/base/audio_decoder_config.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 public: 288 public:
289 ChromeFrameStartupTest() {} 289 ChromeFrameStartupTest() {}
290 290
291 virtual void SetUp() { 291 virtual void SetUp() {
292 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_)); 292 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app_));
293 293
294 chrome_dll_ = dir_app_.Append(L"chrome.dll"); 294 chrome_dll_ = dir_app_.Append(L"chrome.dll");
295 chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName); 295 chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName);
296 chrome_frame_dll_ = dir_app_.Append(kChromeFrameDllName); 296 chrome_frame_dll_ = dir_app_.Append(kChromeFrameDllName);
297 icu_dll_ = dir_app_.Append(L"icudt.dll"); 297 icu_dll_ = dir_app_.Append(L"icudt.dll");
298 avcodec_dll_ = dir_app_.Append(L"avcodec-53.dll"); 298 avcodec_dll_ = dir_app_.Append(L"avcodec-54.dll");
299 avformat_dll_ = dir_app_.Append(L"avformat-53.dll"); 299 avformat_dll_ = dir_app_.Append(L"avformat-54.dll");
300 avutil_dll_ = dir_app_.Append(L"avutil-51.dll"); 300 avutil_dll_ = dir_app_.Append(L"avutil-51.dll");
301 } 301 }
302 302
303 // TODO(iyengar) 303 // TODO(iyengar)
304 // This function is similar to the RunStartupTest function used in chrome 304 // This function is similar to the RunStartupTest function used in chrome
305 // startup tests. Refactor into a common implementation. 305 // startup tests. Refactor into a common implementation.
306 void RunStartupTest(const char* graph, const char* trace, 306 void RunStartupTest(const char* graph, const char* trace,
307 const char* startup_url, bool test_cold, 307 const char* startup_url, bool test_cold,
308 int total_binaries, const FilePath binaries_to_evict[], 308 int total_binaries, const FilePath binaries_to_evict[],
309 bool important, bool ignore_cache_error) { 309 bool important, bool ignore_cache_error) {
(...skipping 1289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles, 1599 PrintPerfTestResults(automation_provider_connect_monitor, kNumCycles,
1600 "automationproviderconnect"); 1600 "automationproviderconnect");
1601 PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles, 1601 PrintPerfTestResults(external_tab_navigate_monitor, kNumCycles,
1602 "externaltabnavigate"); 1602 "externaltabnavigate");
1603 PrintPerfTestResults(renderer_main_monitor, kNumCycles, 1603 PrintPerfTestResults(renderer_main_monitor, kNumCycles,
1604 "beginrenderermain"); 1604 "beginrenderermain");
1605 #ifdef NDEBUG 1605 #ifdef NDEBUG
1606 PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage"); 1606 PrintPerfTestResults(pre_read_chrome_monitor, kNumCycles, "PreReadImage");
1607 #endif // NDEBUG 1607 #endif // NDEBUG
1608 } 1608 }
OLDNEW
« no previous file with comments | « chrome/tools/build/win/FILES.cfg ('k') | media/base/audio_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698