| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 580410309d8ffa5c49e0c2548068c5e06143569a..f67cb42419726a1f737fb6b8d364ddf36fd2d2bf 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
|
| #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.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/favicon_service_factory.h"
|
| #include "chrome/browser/history/chrome_history_client.h"
|
| @@ -426,6 +427,13 @@ 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_);
|
|
|