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

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

Issue 2463423002: Add Settings[, Oberser] java code and JNI bridge. (Closed)
Patch Set: lifetime of ObserverProxy.java and passing Settings object to BlimpClientContextImpl Created 4 years, 1 month 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 66e45b67cafb5b038e760e9ea0d969f5165445dc..0723829e4748b1fb12e762e6b737517de59a62a0 100644
--- a/blimp/client/core/context/blimp_client_context_impl_unittest.cc
+++ b/blimp/client/core/context/blimp_client_context_impl_unittest.cc
@@ -22,6 +22,7 @@
#include "ui/gfx/native_widget_types.h"
#if defined(OS_ANDROID)
+#include "blimp/client/core/settings/android/settings_android.h"
#include "ui/android/window_android.h"
#endif // defined(OS_ANDROID)
@@ -66,9 +67,14 @@ TEST_F(BlimpClientContextImplTest,
TestingPrefServiceSimple prefs;
Settings::RegisterPrefs(prefs.registry());
+#if defined(OS_ANDROID)
+ auto settings = base::MakeUnique<SettingsAndroid>(&prefs);
David Trainor- moved to gerrit 2016/11/07 18:30:58 Don't make the Android one here. We don't build t
Menglin 2016/11/07 19:11:55 Done.
+#else
+ auto settings = base::MakeUnique<Settings>(&prefs);
+#endif // defined(OS_ANDROID)
BlimpClientContextImpl blimp_client_context(
io_thread_.task_runner(), io_thread_.task_runner(),
- base::MakeUnique<MockCompositorDependencies>(), &prefs);
+ base::MakeUnique<MockCompositorDependencies>(), std::move(settings));
TestBlimpClientContextDelegate delegate;
blimp_client_context.SetDelegate(&delegate);

Powered by Google App Engine
This is Rietveld 408576698