[sync] [chromeos] Fix setup flow when sync data is cleared via dashboard and sync is set up again

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 84d2bfcbc6314debd2fadd0a6072f46151af52c5..f6d6869c219da3668fd6cfe8502fb546030c299d 100644
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc
@@ -521,7 +521,8 @@ TEST_P(SyncSetupHandlerTest, DisplayForceLogin) {
 
 // Verifies that the handler correctly handles a cancellation when
 // it is displaying the spinner to the user.
-TEST_P(SyncSetupHandlerTest, DisplayConfigureWithBackendDisabledAndCancel) {
+TEST_P(SyncSetupHandlerTest,
+       DISABLED_DisplayConfigureWithBackendDisabledAndCancel) {
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable())
@@ -557,7 +558,7 @@ TEST_P(SyncSetupHandlerTest, DisplayConfigureWithBackendDisabledAndCancel) {
 // Verifies that the handler correctly transitions from showing the spinner
 // to showing a configuration page when signin completes successfully.
 TEST_P(SyncSetupHandlerTest,
-       DisplayConfigureWithBackendDisabledAndSigninSuccess) {
+       DISABLED_DisplayConfigureWithBackendDisabledAndSigninSuccess) {

[Roger Tawa OOO till Jul 10th, 2013/01/09 15:03:23]

Instead of always disabling this test, you should change it to behave as needed
based on Param().  See line 366 above on how to differentiate between web-based
flow and ClientLogin-based flow.

[James Hawkins, 2013/01/09 18:27:47]

Yeah, I can't LG adding a disabled test.

   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable())