diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 02:40:45 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 02:40:45 +0000 |
| commit | bee961231f36ea5ba271fdcf8804112577bb5fc0 (patch) | |
| tree | 7c2ee56ecb671123edf2d31c4aecc2542f86dbad /chrome/browser | |
| parent | abc374f771f2d810b284c2d714a16510c63d9070 (diff) | |
| download | chromium_src-bee961231f36ea5ba271fdcf8804112577bb5fc0.zip chromium_src-bee961231f36ea5ba271fdcf8804112577bb5fc0.tar.gz chromium_src-bee961231f36ea5ba271fdcf8804112577bb5fc0.tar.bz2 | |
Fix regression: Inform UserManager::UserLoggedIn() when restarting after a crash
This CL fixes a mistake introduced in CL 11598015. When Chrome is restarting
after a crash, the browser_restart argument passed to UserLoggedIn() should be
|true|. Since browser tests (erroneously) use this code path as well, this
breaks a browser test that works only when the browser does not think it was just
restarted after a crash. The CL disables the test until the code path taken by
browser tests is corrected.
BUG=168057
TBR=ivankr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11753002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/chrome_browser_main_chromeos.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_service_browsertest.cc | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index fc76f10..e8d9f72 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -486,7 +486,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() { parsed_command_line().GetSwitchValueASCII(::switches::kLoginUser); VLOG(1) << "Relaunching browser for user: " << username; UserManager* user_manager = UserManager::Get(); - user_manager->UserLoggedIn(username, false); + user_manager->UserLoggedIn(username, true); // Redirects Chrome logging to the user data dir. logging::RedirectChromeLogging(parsed_command_line()); diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc index 429f4ae..ca3e1c6 100644 --- a/chrome/browser/prefs/pref_service_browsertest.cc +++ b/chrome/browser/prefs/pref_service_browsertest.cc @@ -34,7 +34,14 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) { browser()->window()->SetBounds(gfx::Rect(20, 30, 400, 500)); } -IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, Test) { +// Fails on Chrome OS as the browser thinks it is restarting after a crash, see +// http://crbug.com/168044 +#if defined(OS_CHROMEOS) +#define MAYBE_Test DISABLED_Test +#else +#define MAYBE_Test Test +#endif +IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, MAYBE_Test) { gfx::Rect bounds = browser()->window()->GetBounds(); gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500)); ASSERT_EQ(expected_bounds.ToString(), bounds.ToString()); |