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

Side by Side Diff: chrome/test/startup/startup_test.cc

Issue 7185023: Support Chromium-branded builds and cleanup reference build usage. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: . Created 9 years, 6 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/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/test_switches.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 4
5 #include "base/environment.h" 5 #include "base/environment.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 float first_stop_ms; 126 float first_stop_ms;
127 float nth_tab_stop_ms; 127 float nth_tab_stop_ms;
128 }; 128 };
129 TimingInfo timings[kNumCyclesMax]; 129 TimingInfo timings[kNumCyclesMax];
130 130
131 for (int i = 0; i < numCycles; ++i) { 131 for (int i = 0; i < numCycles; ++i) {
132 if (test_cold == COLD) { 132 if (test_cold == COLD) {
133 FilePath dir_app; 133 FilePath dir_app;
134 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app)); 134 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app));
135 135
136 FilePath chrome_exe(dir_app.Append( 136 FilePath chrome_exe(dir_app.Append(GetExecutablePath()));
137 chrome::kBrowserProcessExecutablePath));
138 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_exe)); 137 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_exe));
139 #if defined(OS_WIN) 138 #if defined(OS_WIN)
140 // chrome.dll is windows specific. 139 // chrome.dll is windows specific.
141 FilePath chrome_dll(dir_app.Append(FILE_PATH_LITERAL("chrome.dll"))); 140 FilePath chrome_dll(dir_app.Append(FILE_PATH_LITERAL("chrome.dll")));
142 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_dll)); 141 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_dll));
143 #endif 142 #endif
144 } 143 }
145 UITest::SetUp(); 144 UITest::SetUp();
146 TimeTicks end_time = TimeTicks::Now(); 145 TimeTicks end_time = TimeTicks::Now();
147 146
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 ProxyLauncher::CUSTOM_FRAME, 0, 0); 376 ProxyLauncher::CUSTOM_FRAME, 0, 0);
378 } 377 }
379 378
380 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { 379 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
381 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, 380 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
382 ProxyLauncher::CUSTOM_FRAME_NATIVE_THEME, 0, 0); 381 ProxyLauncher::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
383 } 382 }
384 #endif 383 #endif
385 384
386 } // namespace 385 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/test_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698