Restructure contents of blimp/client.

blimp/client/feature/render_widget_feature.h

 // 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.
 
-#ifndef BLIMP_CLIENT_SESSION_RENDER_WIDGET_FEATURE_H_
-#define BLIMP_CLIENT_SESSION_RENDER_WIDGET_FEATURE_H_
+#ifndef BLIMP_CLIENT_FEATURE_RENDER_WIDGET_FEATURE_H_
+#define BLIMP_CLIENT_FEATURE_RENDER_WIDGET_FEATURE_H_
 
 #include <stdint.h>
 
+#include <map>
+
 #include "base/containers/small_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "blimp/client/blimp_client_export.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/input_message_generator.h"
 
 namespace blink {
 class WebInputEvent;
 }
@@ skipping 80 matching lines @@
 
   // Used to send BlimpMessage::COMPOSITOR messages to the engine.
   scoped_ptr<BlimpMessageProcessor> outgoing_compositor_message_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetFeature);
 };
 
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_RENDER_WIDGET_FEATURE_H_
+#endif  // BLIMP_CLIENT_FEATURE_RENDER_WIDGET_FEATURE_H_