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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options2/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 344 matching lines @@
   values->SetString(
       "defaultBrowserUseAsDefault",
       l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   values->SetString(
       "autoLaunchText",
       l10n_util::GetStringFUTF16(IDS_AUTOLAUNCH_TEXT,
           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.
   values->Set("syncData", GetSyncStateDictionary().release());
 
   values->SetString("privacyLearnMoreURL", chrome::kPrivacyLearnMoreURL);
   values->SetString("sessionRestoreLearnMoreURL",
                     chrome::kSessionRestoreLearnMoreURL);
 
   values->SetString(
@@ skipping 1071 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2