Revert 56423 - Added classes to enable session sync functionality....

chrome/browser/sync/sync_setup_wizard_unittest.cc

 // Copyright (c) 2010 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/sync/sync_setup_wizard.h"
 
 #include "base/json/json_writer.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser.h"
@@ skipping 146 matching lines @@
   // In real life, this is owned by the view that is opened by the browser.  We
   // mock all that out, so we need to take ownership so the flow doesn't leak.
   scoped_ptr<SyncSetupFlow> flow_;
 
   bool was_show_html_dialog_called_;
 };
 
 class SyncSetupWizardTest : public BrowserWithTestWindowTest {
  public:
   SyncSetupWizardTest()
-      : file_thread_(ChromeThread::FILE, MessageLoop::current()),
+      : ui_thread_(ChromeThread::UI, MessageLoop::current()),
+        file_thread_(ChromeThread::FILE, MessageLoop::current()),
         test_window_(NULL),
         wizard_(NULL) { }
   virtual ~SyncSetupWizardTest() { }
   virtual void SetUp() {
     set_profile(new TestingProfileWithSyncService());
     profile()->CreateBookmarkModel(false);
     // Wait for the bookmarks model to load.
     profile()->BlockUntilBookmarkModelLoaded();
     set_browser(new Browser(Browser::TYPE_NORMAL, profile()));
     test_window_ = new TestBrowserWindowForWizardTest(browser());
     set_window(test_window_);
     browser()->set_window(window());
     BrowserList::SetLastActive(browser());
     service_ = static_cast<ProfileSyncServiceForWizardTest*>(
         profile()->GetProfileSyncService());
     wizard_.reset(new SyncSetupWizard(service_));
   }
 
   virtual void TearDown() {
     test_window_ = NULL;
     service_ = NULL;
     wizard_.reset();
   }
 
+  ChromeThread ui_thread_;
   ChromeThread file_thread_;
   TestBrowserWindowForWizardTest* test_window_;
   scoped_ptr<SyncSetupWizard> wizard_;
   ProfileSyncServiceForWizardTest* service_;
 };
 
 // See http://code.google.com/p/chromium/issues/detail?id=40715 for
 // why we skip the below tests on OS X.  We don't use DISABLED_ as we
 // would have to change the corresponding FRIEND_TEST() declarations.
 
@@ skipping 95 matching lines @@
 TEST_F(SyncSetupWizardTest, ChooseDataTypesSetsPrefs) {
   SKIP_TEST_ON_MACOSX();
   wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
   wizard_->Step(SyncSetupWizard::CHOOSE_DATA_TYPES);
 
   ListValue data_type_choices_value;
   std::string data_type_choices = "{\"keepEverythingSynced\":false,";
   data_type_choices += "\"syncBookmarks\":true,\"syncPreferences\":true,";
   data_type_choices += "\"syncThemes\":false,\"syncPasswords\":false,";
   data_type_choices += "\"syncAutofill\":false,\"syncExtensions\":false,";
-  data_type_choices += "\"syncTypedUrls\":true,\"syncApps\":true,";
-  data_type_choices += "\"syncSessions\":false}";
+  data_type_choices += "\"syncTypedUrls\":true,\"syncApps\":true}";
   data_type_choices_value.Append(new StringValue(data_type_choices));
 
   // Simulate the user choosing data types; bookmarks, prefs, typed
   // URLS, and apps are on, the rest are off.
   test_window_->flow()->flow_handler_->HandleChooseDataTypes(
       &data_type_choices_value);
   EXPECT_TRUE(wizard_->IsVisible());
   EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());
   EXPECT_FALSE(service_->keep_everything_synced_);
   EXPECT_EQ(service_->chosen_data_types_.count(syncable::BOOKMARKS), 1U);
@@ skipping 163 matching lines @@
   int error = -1;
   dialog_args.GetInteger("error", &error);
   EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);
   service_->set_auth_state(kTestUser, AuthError::None());
 
   wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
   EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());
 }
 
 #undef SKIP_TEST_ON_MACOSX