Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

Index: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
===================================================================
--- chrome/browser/chromeos/login/parallel_authenticator_unittest.cc	(revision 154482)
+++ chrome/browser/chromeos/login/parallel_authenticator_unittest.cc	(working copy)
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/test_attempt_state.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
@@ -35,13 +34,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+using content::BrowserThread;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::SetArgPointee;
 using ::testing::_;
-using content::BrowserThread;
 
 namespace chromeos {
 
@@ -209,10 +208,8 @@
   std::string password_;
   std::string hash_ascii_;
 
-  ScopedDeviceSettingsTestHelper device_settings_test_helper_;
-
   // Initializes / shuts down a stub CrosLibrary.
-  ScopedStubCrosEnabler stub_cros_enabler_;
+  chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
 
   // Mocks, destroyed by CrosLibrary class.
   MockCertLibrary* mock_cert_library_;
@@ -343,8 +340,8 @@
 
   EXPECT_EQ(ParallelAuthenticator::CONTINUE,
             SetAndResolveState(auth_, state_.release()));
-  // Let the owner verification run.
-  device_settings_test_helper_.Flush();
+  // Let the owner verification run on the FILE thread...
+  message_loop_.RunAllPending();
   // and test that the mount has succeeded.
   state_.reset(new TestAttemptState(username_,
                                     password_,