Restructure contents of blimp/client.

blimp/client/feature/navigation_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_NAVIGATION_FEATURE_H_
-#define BLIMP_CLIENT_SESSION_NAVIGATION_FEATURE_H_
+#ifndef BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_
+#define BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_
+
+#include <map>
+#include <string>
 
 #include "base/containers/small_map.h"
 #include "base/macros.h"
 #include "blimp/client/blimp_client_export.h"
 #include "blimp/net/blimp_message_processor.h"
 
 class GURL;
 class SkBitmap;
 
 namespace blimp {
@@ skipping 45 matching lines @@
 
   // Used to send BlimpMessage::NAVIGATION messages to the engine.
   scoped_ptr<BlimpMessageProcessor> outgoing_message_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationFeature);
 };
 
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_NAVIGATION_FEATURE_H_
+#endif  // BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_