Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Unified Diff: chrome/browser/extensions/extension_service_unittest.h

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix LoginUtilsTest Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_service_unittest.h
diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h
index 6f46f77896f4fefe416f6ccdfbfe32bde00f6598..c5048307d04dec6b16cd648068ae58248b2d81f6 100644
--- a/chrome/browser/extensions/extension_service_unittest.h
+++ b/chrome/browser/extensions/extension_service_unittest.h
@@ -17,6 +17,10 @@
#include "content/public/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#endif
+
class TestingProfile;
namespace extensions {
@@ -73,6 +77,10 @@ class ExtensionServiceTestBase : public extensions::ExtensionTest {
content::TestBrowserThread file_user_blocking_thread_;
content::TestBrowserThread io_thread_;
extensions::FeatureSwitch::ScopedOverride override_sideload_wipeout_;
+#if defined(OS_CHROMEOS)
+ // ExtensionService depends on UserManager which depends on CrosSettings.
+ chromeos::ScopedTestCrosSettings test_cros_settings_;
+#endif
};
#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_UNITTEST_H_

Powered by Google App Engine
This is Rietveld 408576698