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

Unified Diff: chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc

Issue 12670013: Out-of-process import on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: extract some more CLs Created 7 years, 8 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/sync/profile_signin_confirmation_helper_browsertest.cc
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
index f00a907bd4a6383a113e92af0228b65929159ad2..736a5fa5583433706298a744b09039ad6222a2aa 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
@@ -22,11 +22,6 @@ class ProfileSigninConfirmationHelperBrowserTest : public InProcessBrowserTest {
// Force the first-run flow to trigger autoimport.
InProcessBrowserTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kForceFirstRun);
-
- // The forked import process should run BrowserMain.
- CommandLine import_arguments((CommandLine::NoProgram()));
- import_arguments.AppendSwitch(content::kLaunchAsBrowser);
- first_run::SetExtraArgumentsForImportProcess(import_arguments);
}
private:
@@ -36,7 +31,7 @@ class ProfileSigninConfirmationHelperBrowserTest : public InProcessBrowserTest {
IN_PROC_BROWSER_TEST_F(ProfileSigninConfirmationHelperBrowserTest,
HasNotBeenShutdown) {
#if !defined(OS_CHROMEOS)
- EXPECT_TRUE(first_run::DidPerformProfileImport(NULL));
+ EXPECT_TRUE(first_run::GetAutoImportState() & first_run::AUTO_IMPORT_CALLED);
#endif
EXPECT_FALSE(ui::HasBeenShutdown(browser()->profile()));
}

Powered by Google App Engine
This is Rietveld 408576698