Fix for number of ChromeOS browser_tests that were failing in BVTs.

chrome/browser/ui/webui/options2/browser_options_handler.cc

Index: chrome/browser/ui/webui/options2/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc
index 5dc5be28191f767fa0e13b5b4043dd07e5f97b1c..fd5a0358f701951317ddeac34394fca98439ae7c 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.cc
@@ -362,10 +362,9 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
 #if defined(OS_CHROMEOS)
-  if (chromeos::UserManager::Get()->IsUserLoggedIn()) {
     values->SetString("username",
-        chromeos::UserManager::Get()->GetLoggedInUser().email());
-  }
+        chromeos::UserManager::Get()->IsUserLoggedIn() ?
+            chromeos::UserManager::Get()->GetLoggedInUser().email() : "");

[sky, 2012/08/08 21:07:24]

nit: "" -> std::string().

 #endif
 
   // Pass along sync status early so it will be available during page init.