Cleanup blimp/client/core code organization.

blimp/client/core/context/blimp_client_context_impl.cc

Index: blimp/client/core/context/blimp_client_context_impl.cc
diff --git a/blimp/client/core/blimp_client_context_impl.cc b/blimp/client/core/context/blimp_client_context_impl.cc
similarity index 97%
rename from blimp/client/core/blimp_client_context_impl.cc
rename to blimp/client/core/context/blimp_client_context_impl.cc
index 4bd2af09b6811ce5ae26e9b8333414cf35cb556c..e9eda6ae2de473637f806adc9f7556721a620a36 100644
--- a/blimp/client/core/blimp_client_context_impl.cc
+++ b/blimp/client/core/context/blimp_client_context_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/core/blimp_client_context_impl.h"
+#include "blimp/client/core/context/blimp_client_context_impl.h"
 
 #include <utility>
 
@@ -12,7 +12,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "blimp/client/core/blimp_client_switches.h"
 #include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
 #include "blimp/client/core/compositor/blob_channel_feature.h"
 #include "blimp/client/core/contents/blimp_contents_impl.h"
@@ -25,6 +24,7 @@
 #include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/core/session/cross_thread_network_event_observer.h"
 #include "blimp/client/core/settings/settings_feature.h"
+#include "blimp/client/core/switches/blimp_client_switches.h"
 #include "blimp/client/public/blimp_client_context_delegate.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 #include "device/geolocation/geolocation_delegate.h"
@@ -32,7 +32,7 @@
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
-#include "blimp/client/core/android/blimp_client_context_impl_android.h"
+#include "blimp/client/core/context/android/blimp_client_context_impl_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {