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

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

Issue 5968008: Update file version info/memory details/process utils to use string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years 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) 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/platform_thread.h" 8 #include "base/platform_thread.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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 float nth_tab_stop_ms; 128 float nth_tab_stop_ms;
129 }; 129 };
130 TimingInfo timings[kNumCyclesMax]; 130 TimingInfo timings[kNumCyclesMax];
131 131
132 for (int i = 0; i < numCycles; ++i) { 132 for (int i = 0; i < numCycles; ++i) {
133 if (test_cold == COLD) { 133 if (test_cold == COLD) {
134 FilePath dir_app; 134 FilePath dir_app;
135 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app)); 135 ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app));
136 136
137 FilePath chrome_exe(dir_app.Append( 137 FilePath chrome_exe(dir_app.Append(
138 FilePath::FromWStringHack(chrome::kBrowserProcessExecutablePath))); 138 chrome::kBrowserProcessExecutablePath));
Evan Martin 2010/12/22 23:03:59 Maybe fits on one line?
Avi (use Gerrit) 2010/12/22 23:25:02 Nope.
139 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_exe)); 139 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_exe));
140 #if defined(OS_WIN) 140 #if defined(OS_WIN)
141 // chrome.dll is windows specific. 141 // chrome.dll is windows specific.
142 FilePath chrome_dll(dir_app.Append(FILE_PATH_LITERAL("chrome.dll"))); 142 FilePath chrome_dll(dir_app.Append(FILE_PATH_LITERAL("chrome.dll")));
143 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_dll)); 143 ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_dll));
144 #endif 144 #endif
145 145
146 #if defined(OS_WIN) 146 #if defined(OS_WIN)
147 // TODO(port): Re-enable once gears is working on mac/linux. 147 // TODO(port): Re-enable once gears is working on mac/linux.
148 FilePath gears_dll; 148 FilePath gears_dll;
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 UITest::CUSTOM_FRAME, 0, 0); 399 UITest::CUSTOM_FRAME, 0, 0);
400 } 400 }
401 401
402 TEST_F(StartupTest, PerfNativeFrameGtkTheme) { 402 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
403 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT, 403 RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
404 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0); 404 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
405 } 405 }
406 #endif 406 #endif
407 407
408 } // namespace 408 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698