Make CrosSettings and DeviceSettingsService non Lazy instances

chrome/browser/chromeos/login/merge_session_load_page_unittest.cc

 // Copyright (c) 2013 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/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"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 
 using content::BrowserThread;
 using content::InterstitialPage;
 using content::WebContents;
@@ skipping 50 matching lines @@
   // showing.
   InterstitialPage* GetMergeSessionLoadPage() {
     return InterstitialPage::GetInterstitialPage(web_contents());
   }
 
  private:
   content::TestBrowserThread ui_thread_;
   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);
 };
 
 TEST_F(MergeSessionLoadPageTest, MergeSessionPageNotShown) {
   UserManager::Get()->SetMergeSessionState(
       UserManager::MERGE_STATUS_DONE);
   // Start a load.
   Navigate(kURL1, 1);
   // Load next page.
@@ skipping 29 matching lines @@
 
   // The URL remains to be URL2.
   EXPECT_EQ(kURL2, web_contents()->GetURL().spec());
 
   // Commit navigation and the interstitial page is gone.
   Navigate(kURL2, 2);
   EXPECT_FALSE(GetMergeSessionLoadPage());
 }
 
 }  // namespace chromeos