| Index: chrome/test/base/testing_profile.cc | 
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc | 
| index 6e0941e76c27287f7942f28dfc655c75bef3b05f..69df0245b1e161b7d0fa18e48fa0057250808177 100644 | 
| --- a/chrome/test/base/testing_profile.cc | 
| +++ b/chrome/test/base/testing_profile.cc | 
| @@ -26,6 +26,7 @@ | 
| #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 
| #include "chrome/browser/browser_process.h" | 
| #include "chrome/browser/chrome_notification_types.h" | 
| +#include "chrome/browser/chromeos/settings/cros_settings.h" | 
| #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 
| #include "chrome/browser/favicon/chrome_fallback_icon_client_factory.h" | 
| #include "chrome/browser/favicon/fallback_icon_service_factory.h" | 
| @@ -428,6 +429,12 @@ void TestingProfile::Init() { | 
| content::BrowserThread::UI) || | 
| content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 
|  | 
| +#if defined(OS_CHROMEOS) | 
| +  if (!chromeos::CrosSettings::IsInitialized()) | 
| +    scoped_cros_settings_test_helper_.reset( | 
| +        new chromeos::ScopedCrosSettingsTestHelper); | 
| +#endif | 
| + | 
| set_is_guest_profile(guest_session_); | 
|  | 
| BrowserContext::Initialize(this, profile_path_); | 
|  |