Cleanup blimp/client/core code organization.

blimp/client/core/context/dummy_blimp_client_context.cc

 // Copyright 2016 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/core/dummy_blimp_client_context.h"
+#include "blimp/client/core/context/dummy_blimp_client_context.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 
 #if defined(OS_ANDROID)
-#include "blimp/client/core/android/dummy_blimp_client_context_android.h"
+#include "blimp/client/core/context/android/dummy_blimp_client_context_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {
 namespace client {
 
 // This function is declared in //blimp/client/public/blimp_client_context.h,
 // and either this function or the one in
 // //blimp/client/core/blimp_client_context_impl.cc should be linked in to
 // any binary using BlimpClientContext::Create.
 // static
@@ skipping 26 matching lines @@
   NOTREACHED();
 }
 
 void DummyBlimpClientContext::ConnectWithAssignment(
     const Assignment& assignment) {
   NOTREACHED();
 }
 
 }  // namespace client
 }  // namespace blimp