Restructure contents of blimp/client.

blimp/client/feature/render_widget_feature.h

Index: blimp/client/feature/render_widget_feature.h
diff --git a/blimp/client/session/render_widget_feature.h b/blimp/client/feature/render_widget_feature.h
similarity index 95%
rename from blimp/client/session/render_widget_feature.h
rename to blimp/client/feature/render_widget_feature.h
index 2982acc0cd2e4730bca6b41cd35dde8ce9d404ae..cb938d740d4553cd8a95b7eae4b26e7b91ec2ee5 100644
--- a/blimp/client/session/render_widget_feature.h
+++ b/blimp/client/feature/render_widget_feature.h
@@ -2,11 +2,13 @@
 // 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"
@@ -107,4 +109,4 @@ class BLIMP_CLIENT_EXPORT RenderWidgetFeature : public BlimpMessageProcessor {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_RENDER_WIDGET_FEATURE_H_
+#endif  // BLIMP_CLIENT_FEATURE_RENDER_WIDGET_FEATURE_H_