Move remaining Blimp feature code to core.

blimp/client/support/compositor/mock_compositor_dependencies.h

 // 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.
 
-#ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_MOCK_COMPOSITOR_DEPENDENCIES_H_
-#define BLIMP_CLIENT_FEATURE_COMPOSITOR_MOCK_COMPOSITOR_DEPENDENCIES_H_
+#ifndef BLIMP_CLIENT_SUPPORT_COMPOSITOR_MOCK_COMPOSITOR_DEPENDENCIES_H_
+#define BLIMP_CLIENT_SUPPORT_COMPOSITOR_MOCK_COMPOSITOR_DEPENDENCIES_H_
 
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
 
 namespace blimp {
 namespace client {
 
 class MockCompositorDependencies : public CompositorDependenciesImpl {
  public:
   MockCompositorDependencies() = default;
   ~MockCompositorDependencies() override = default;
 
   // CompositorDependenciesImpl implementation.
   void GetContextProvider(const ContextProviderCallback& callback) override;
 };
 
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_FEATURE_COMPOSITOR_MOCK_COMPOSITOR_DEPENDENCIES_H_
+#endif  // BLIMP_CLIENT_SUPPORT_COMPOSITOR_MOCK_COMPOSITOR_DEPENDENCIES_H_