ui: Cleanup class/struct forward declarations

blimp/client/core/context/blimp_client_context_impl_unittest.cc

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..9b2e6c4214b4f03314964871876aa7c6ba5fe634 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,10 @@ TEST_F(BlimpClientContextImplTest,
   TestingPrefServiceSimple prefs;
   Settings::RegisterPrefs(prefs.registry());
 
+  auto settings = base::MakeUnique<Settings>(&prefs);
   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);