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

Side by Side Diff: chrome/browser/process_singleton_uitest.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
« no previous file with comments | « chrome/browser/process_singleton_linux.cc ('k') | chrome/browser/shell_integration_linux.cc » ('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 // This test validates that the ProcessSingleton class properly makes sure 5 // This test validates that the ProcessSingleton class properly makes sure
6 // that there is only one main browser process. 6 // that there is only one main browser process.
7 // 7 //
8 // It is currently compiled and run on Windows and Posix(non-Mac) platforms. 8 // It is currently compiled and run on Windows and Posix(non-Mac) platforms.
9 // Mac uses system services and ProcessSingletonMac is a noop. (Maybe it still 9 // Mac uses system services and ProcessSingletonMac is a noop. (Maybe it still
10 // makes sense to test that the system services are giving the behavior we 10 // makes sense to test that the system services are giving the behavior we
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 process_handle_ = base::kNullProcessHandle; 54 process_handle_ = base::kNullProcessHandle;
55 process_terminated_ = false; 55 process_terminated_ = false;
56 } 56 }
57 57
58 void StartChrome(base::WaitableEvent* start_event, bool first_run) { 58 void StartChrome(base::WaitableEvent* start_event, bool first_run) {
59 // TODO(mattm): maybe stuff should be refactored to use 59 // TODO(mattm): maybe stuff should be refactored to use
60 // UITest::LaunchBrowserHelper somehow? 60 // UITest::LaunchBrowserHelper somehow?
61 FilePath browser_directory; 61 FilePath browser_directory;
62 PathService::Get(chrome::DIR_APP, &browser_directory); 62 PathService::Get(chrome::DIR_APP, &browser_directory);
63 CommandLine command_line(browser_directory.Append( 63 CommandLine command_line(browser_directory.Append(
64 FilePath::FromWStringHack(chrome::kBrowserProcessExecutablePath))); 64 chrome::kBrowserProcessExecutablePath));
65 65
66 command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir_); 66 command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir_);
67 67
68 if (first_run) 68 if (first_run)
69 command_line.AppendSwitch(switches::kFirstRun); 69 command_line.AppendSwitch(switches::kFirstRun);
70 else 70 else
71 command_line.AppendSwitch(switches::kNoFirstRun); 71 command_line.AppendSwitch(switches::kNoFirstRun);
72 72
73 // Add the normal test-mode switches, except for the ones we're adding 73 // Add the normal test-mode switches, except for the ones we're adding
74 // ourselves. 74 // ourselves.
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 pending_starters.empty(); 317 pending_starters.empty();
318 if (chrome_starters_[last_index]->process_handle_ != 318 if (chrome_starters_[last_index]->process_handle_ !=
319 base::kNullProcessHandle) { 319 base::kNullProcessHandle) {
320 KillProcessTree(chrome_starters_[last_index]->process_handle_); 320 KillProcessTree(chrome_starters_[last_index]->process_handle_);
321 chrome_starters_[last_index]->done_event_.Wait(); 321 chrome_starters_[last_index]->done_event_.Wait();
322 } 322 }
323 } 323 }
324 } 324 }
325 325
326 } // namespace 326 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton_linux.cc ('k') | chrome/browser/shell_integration_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698