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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc

Issue 12674028: Report text output and exit code for command-line operations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Line endings. Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
index bf3a31ffe6e1b5b2d933852fb4767e17a6e843d1..1ee6ae124fc8a8488cf35ea7a8ed4c9e5824d747 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
@@ -8,6 +8,7 @@
#include "base/files/file_path.h"
#include "base/message_loop.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/operation_output.h"
#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sessions/session_restore.h"
@@ -60,7 +61,6 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, LastUsedProfileActivated) {
// Do a simple non-process-startup browser launch.
CommandLine dummy(CommandLine::NO_PROGRAM);
- int return_code;
StartupBrowserCreator browser_creator;
std::vector<Profile*> last_opened_profiles;
last_opened_profiles.push_back(profile_1);
@@ -68,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, LastUsedProfileActivated) {
last_opened_profiles.push_back(profile_3);
last_opened_profiles.push_back(profile_4);
browser_creator.Start(dummy, profile_manager->user_data_dir(), profile_2,
- last_opened_profiles, &return_code);
+ last_opened_profiles, scoped_ptr<OperationOutput>());
while (!browser_creator.ActivatedProfile())
MessageLoop::current()->RunUntilIdle();

Powered by Google App Engine
This is Rietveld 408576698