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

Unified Diff: blimp/client/core/context/blimp_client_context_impl_unittest.cc

Issue 2349073002: Blimp Settings framework on the c++ side (Closed)
Patch Set: nits and sync to head Created 4 years, 2 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: blimp/client/core/context/blimp_client_context_impl_unittest.cc
diff --git a/blimp/client/core/context/blimp_client_context_impl_unittest.cc b/blimp/client/core/context/blimp_client_context_impl_unittest.cc
index ffe97167d62067ab47b170bfe577726e56e603e1..66e45b67cafb5b038e760e9ea0d969f5165445dc 100644
--- a/blimp/client/core/context/blimp_client_context_impl_unittest.cc
+++ b/blimp/client/core/context/blimp_client_context_impl_unittest.cc
@@ -11,10 +11,12 @@
#include "base/threading/thread.h"
#include "blimp/client/core/contents/blimp_contents_impl.h"
#include "blimp/client/core/contents/tab_control_feature.h"
+#include "blimp/client/core/settings/settings.h"
#include "blimp/client/public/blimp_client_context_delegate.h"
#include "blimp/client/public/contents/blimp_contents.h"
#include "blimp/client/test/compositor/mock_compositor_dependencies.h"
#include "blimp/client/test/test_blimp_client_context_delegate.h"
+#include "components/prefs/testing_pref_service.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/native_widget_types.h"
@@ -61,9 +63,12 @@ class BlimpClientContextImplTest : public testing::Test {
TEST_F(BlimpClientContextImplTest,
CreatedBlimpContentsGetsHelpersAttachedAndHasTabControlFeature) {
+ TestingPrefServiceSimple prefs;
+ Settings::RegisterPrefs(prefs.registry());
+
BlimpClientContextImpl blimp_client_context(
io_thread_.task_runner(), io_thread_.task_runner(),
- base::MakeUnique<MockCompositorDependencies>());
+ base::MakeUnique<MockCompositorDependencies>(), &prefs);
TestBlimpClientContextDelegate delegate;
blimp_client_context.SetDelegate(&delegate);
« no previous file with comments | « blimp/client/core/context/blimp_client_context_impl.cc ('k') | blimp/client/core/context/dummy_blimp_client_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698