suppress user/password dialog when re-enabling sync

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
index 520182a82e99a9382e6aa6eb5fbed30e536e15fe..e00d3ece1950ebcad40ab4f0f6ffb42e1d939016 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -286,6 +286,7 @@ static void CheckShowSyncSetupArgs(const DictionaryValue* dictionary,
 TEST_F(SyncSetupHandlerTest, Basic) {
 }
 
+#if !defined(OS_CHROMEOS)
 TEST_F(SyncSetupHandlerTest, DisplayBasicLogin) {
   EXPECT_CALL(*mock_pss_, AreCredentialsAvailable())
       .WillRepeatedly(Return(false));
@@ -399,6 +400,7 @@ TEST_F(SyncSetupHandlerTest, HandleCaptcha) {
       dictionary, "", false, GoogleServiceAuthError::CAPTCHA_REQUIRED,
       kTestUser, true, kTestCaptchaImageUrl);
 }
+#endif  // !OS_CHROMEOS
 
 TEST_F(SyncSetupHandlerTest, HandleFatalError) {
   EXPECT_CALL(*mock_pss_, AreCredentialsAvailable())
@@ -419,6 +421,7 @@ TEST_F(SyncSetupHandlerTest, HandleFatalError) {
       dictionary, "", true, GoogleServiceAuthError::NONE, "", true, "");
 }
 
+#if !defined(OS_CHROMEOS)

[Andrew T Wilson (Slow), 2012/04/03 17:45:13]

I think we'll still need some flavor of this test, since even on cros you can
get an unrecoverable error while starting up sync.

[kochi, 2012/04/03 21:55:29]

Added TODO.

On 2012/04/03 17:45:13, Andrew T Wilson wrote:

 TEST_F(SyncSetupHandlerTest, UnrecoverableErrorInitializingSync) {
   EXPECT_CALL(*mock_pss_, AreCredentialsAvailable())
       .WillRepeatedly(Return(false));
@@ -493,6 +496,7 @@ TEST_F(SyncSetupHandlerTest, GaiaErrorInitializingSync) {
       dictionary, "", false, GoogleServiceAuthError::SERVICE_UNAVAILABLE,
       kTestUser, true, "");
 }
+#endif  // !OS_CHROMEOS
 
 TEST_F(SyncSetupHandlerTest, TestSyncEverything) {
   std::string args =