Restructure contents of blimp/client.

blimp/client/app/android/toolbar.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_ANDROID_TOOLBAR_H_
-#define BLIMP_CLIENT_ANDROID_TOOLBAR_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_
+#define BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_
+
+#include <string>
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "blimp/client/session/navigation_feature.h"
+#include "blimp/client/feature/navigation_feature.h"
 
 class GURL;
 class SkBitmap;
 
 namespace blimp {
 namespace client {
 
 // The native component of org.chromium.blimp.toolbar.Toolbar.  This handles
 // marshalling calls between Java and native.  Specifically, this passes calls
 // between Toolbar.java <=> NavigationFeature.
@@ skipping 33 matching lines @@
 
   // Reference to the Java object which owns this class.
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
   DISALLOW_COPY_AND_ASSIGN(Toolbar);
 };
 
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_ANDROID_TOOLBAR_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_