Move remaining Blimp feature code to core.

blimp/client/app/android/blimp_view.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/app/android/blimp_view.h"
 
 #include <android/native_window_jni.h>
 
 #include "base/memory/ptr_util.h"
 #include "blimp/client/app/android/blimp_client_session_android.h"
 #include "blimp/client/app/compositor/browser_compositor.h"
 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
-#include "blimp/client/feature/compositor/blimp_compositor_manager.h"
+#include "blimp/client/core/compositor/blimp_compositor_manager.h"
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
 #include "jni/BlimpView_jni.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"
 
 using base::android::JavaParamRef;
 
 namespace blimp {
 namespace client {
 
@@ skipping 178 matching lines @@
   return compositor_manager_->OnTouchEvent(event);
 }
 
 void BlimpView::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_BlimpView_onSwapBuffersCompleted(env, java_obj_);
 }
 
 }  // namespace client
 }  // namespace blimp