Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/merge_session_load_page_unittest.cc

Index: chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
diff --git a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
index c9c722524d5233a7139ea03c5862177b4a30fc3b..d3bdb49564cc7d5277e335b6fe745b8545597625 100644
--- a/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
+++ b/chrome/browser/chromeos/login/merge_session_load_page_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/merge_session_load_page.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
@@ -74,8 +75,8 @@ class MergeSessionLoadPageTest : public ChromeRenderViewHostTestHarness {
   content::TestBrowserThread file_user_blocking_thread_;
   content::TestBrowserThread io_thread_;
 
-  // Initializes / shuts down a stub CrosLibrary.
   chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
+  chromeos::ScopedTestCrosSettings test_cros_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(MergeSessionLoadPageTest);
 };