Restructure contents of blimp/client.

Restructure contents of blimp/client folder. See crbug.com/581506
for more information on the eventual directory structure.
Modify paths and ifdef guards as needed.
Resolve various linter errors encountered along the way.
Add TODOs for missing documentation.

R=dtrainor@chromium.org,haibinlu@chromium.org
BUG=581506

Review URL: https://codereview.chromium.org/1636163002

Cr-Commit-Position: refs/heads/master@{#371684}

blimp/BUILD.gn

@@ -49,7 +49,7 @@ group("blimp_tests") {
 
 test("blimp_unittests") {
   deps = [
-    "//blimp/client:unit_tests",
+    "//blimp/client:feature_unit_tests",
     "//blimp/common:unit_tests",
     "//blimp/net:unit_tests",
   ]

blimp/client/BUILD.gn

@@ -11,33 +11,13 @@ if (is_android) {
 
 component("blimp_client") {
   sources = [
+    "app/blimp_client_switches.cc",
+    "app/blimp_client_switches.h",
+    "app/blimp_startup.cc",
+    "app/blimp_startup.h",
     "blimp_client_export.h",
-    "blimp_client_switches.cc",
-    "blimp_client_switches.h",
-    "blimp_startup.cc",
-    "blimp_startup.h",
-    "compositor/blimp_compositor.cc",
-    "compositor/blimp_compositor.h",
-    "compositor/blimp_context_provider.cc",
-    "compositor/blimp_context_provider.h",
-    "compositor/blimp_layer_tree_settings.cc",
-    "compositor/blimp_layer_tree_settings.h",
-    "compositor/blimp_output_surface.cc",
-    "compositor/blimp_output_surface.h",
-    "compositor/test/dummy_layer_driver.cc",
-    "compositor/test/dummy_layer_driver.h",
-    "input/blimp_input_handler_wrapper.cc",
-    "input/blimp_input_handler_wrapper.h",
-    "input/blimp_input_manager.cc",
-    "input/blimp_input_manager.h",
     "session/blimp_client_session.cc",
     "session/blimp_client_session.h",
-    "session/navigation_feature.cc",
-    "session/navigation_feature.h",
-    "session/render_widget_feature.cc",
-    "session/render_widget_feature.h",
-    "session/tab_control_feature.cc",
-    "session/tab_control_feature.h",
   ]
 
   defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ]
@@ -47,35 +27,72 @@ component("blimp_client") {
   ]
 
   deps = [
+    ":feature",
     "//base",
-    "//blimp/common:blimp_common",
     "//blimp/common/proto",
     "//blimp/net:blimp_net",
     "//cc",
+    "//gpu/skia_bindings",
+    "//net",
+    "//ui/gfx/geometry",
+    "//url:url",
+  ]
+}
+
+source_set("feature") {
+  sources = [
+    "feature/compositor/blimp_compositor.cc",
+    "feature/compositor/blimp_compositor.h",
+    "feature/compositor/blimp_context_provider.cc",
+    "feature/compositor/blimp_context_provider.h",
+    "feature/compositor/blimp_input_handler_wrapper.cc",
+    "feature/compositor/blimp_input_handler_wrapper.h",
+    "feature/compositor/blimp_input_manager.cc",
+    "feature/compositor/blimp_input_manager.h",
+    "feature/compositor/blimp_layer_tree_settings.cc",
+    "feature/compositor/blimp_layer_tree_settings.h",
+    "feature/compositor/blimp_output_surface.cc",
+    "feature/compositor/blimp_output_surface.h",
+    "feature/compositor/test/dummy_layer_driver.cc",
+    "feature/compositor/test/dummy_layer_driver.h",
+    "feature/navigation_feature.cc",
+    "feature/navigation_feature.h",
+    "feature/render_widget_feature.cc",
+    "feature/render_widget_feature.h",
+    "feature/tab_control_feature.cc",
+    "feature/tab_control_feature.h",
+  ]
+
+  deps = [
+    "//blimp/common:blimp_common",
+    "//cc",
     "//cc/proto",
     "//gpu/command_buffer/client:gl_in_process_context",
     "//gpu/command_buffer/common:gles2_utils",
     "//gpu/skia_bindings",
-    "//net",
+    "//skia",
     "//ui/events/blink",
     "//ui/events/gestures/blink",
-    "//ui/gfx/geometry",
     "//ui/gl",
-    "//url:url",
+  ]
+
+  public_deps = [
+    "//blimp/common/proto",
   ]
 }
 
-source_set("unit_tests") {
+source_set("feature_unit_tests") {
   testonly = true
 
   sources = [
-    "session/navigation_feature_unittest.cc",
-    "session/render_widget_feature_unittest.cc",
-    "session/tab_control_feature_unittest.cc",
+    "feature/navigation_feature_unittest.cc",
+    "feature/render_widget_feature_unittest.cc",
+    "feature/tab_control_feature_unittest.cc",
   ]
 
   deps = [
     ":blimp_client",
+    ":feature",
     "//base",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
@@ -93,15 +110,16 @@ source_set("unit_tests") {
 if (is_linux && !is_chromeos && use_x11) {
   executable("blimp_shell") {
     sources = [
-      "linux/blimp_display_manager.cc",
-      "linux/blimp_display_manager.h",
-      "linux/blimp_main.cc",
-      "session/blimp_client_session_linux.cc",
-      "session/blimp_client_session_linux.h",
+      "app/linux/blimp_client_session_linux.cc",
+      "app/linux/blimp_client_session_linux.h",
+      "app/linux/blimp_display_manager.cc",
+      "app/linux/blimp_display_manager.h",
+      "app/linux/blimp_main.cc",
     ]
 
     deps = [
       ":blimp_client",
+      ":feature",
       "//base",
       "//blimp/net:blimp_net",
       "//net",
@@ -125,31 +143,31 @@ if (is_android) {
   jinja_variables = [ "manifest_package=$manifest_package" ]
 
   jinja_template("blimp_apk_manifest") {
-    input = "android/AndroidManifest.xml.jinja2"
+    input = "app/android/AndroidManifest.xml.jinja2"
     output = blimp_apk_manifest
     variables = jinja_variables
   }
 
   jinja_template("blimp_test_apk_manifest") {
-    input = "android/javatests/AndroidManifest.xml.jinja2"
+    input = "app/android/javatests/AndroidManifest.xml.jinja2"
     output = blimp_test_apk_manifest
     variables = jinja_variables
   }
 
   generate_jni("jni_headers") {
     sources = [
-      "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
-      "android/java/src/org/chromium/blimp/BlimpView.java",
-      "android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
-      "android/java/src/org/chromium/blimp/session/TabControlFeature.java",
-      "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
+      "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
+      "app/android/java/src/org/chromium/blimp/BlimpView.java",
+      "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
+      "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
+      "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
     ]
 
     jni_package = "blimp"
   }
 
   android_resources("blimp_java_resources") {
-    resource_dirs = [ "android/java/res" ]
+    resource_dirs = [ "app/android/java/res" ]
     deps = [
       ":blimp_strings_grd",
     ]
@@ -157,7 +175,7 @@ if (is_android) {
   }
 
   java_strings_grd("blimp_strings_grd") {
-    grd_file = "android/java/strings/android_blimp_strings.grd"
+    grd_file = "app/android/java/strings/android_blimp_strings.grd"
     outputs = [
       "values-am/android_blimp_strings.xml",
       "values-ar/android_blimp_strings.xml",
@@ -218,17 +236,17 @@ if (is_android) {
     ]
 
     java_files = [
-      "android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
-      "android/java/src/org/chromium/blimp/auth/TokenSource.java",
-      "android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
-      "android/java/src/org/chromium/blimp/BlimpApplication.java",
-      "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
-      "android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
-      "android/java/src/org/chromium/blimp/BlimpView.java",
-      "android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
-      "android/java/src/org/chromium/blimp/session/TabControlFeature.java",
-      "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
-      "android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
+      "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
+      "app/android/java/src/org/chromium/blimp/auth/TokenSource.java",
+      "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
+      "app/android/java/src/org/chromium/blimp/BlimpApplication.java",
+      "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
+      "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
+      "app/android/java/src/org/chromium/blimp/BlimpView.java",
+      "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
+      "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
+      "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
+      "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
     ]
   }
 
@@ -244,14 +262,15 @@ if (is_android) {
     ]
 
     java_files = [
-      "android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
-      "android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
+      "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
+      "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
     ]
   }
 
   shared_library("blimp_client_android") {
     deps = [
       ":blimp_client",
+      ":feature",
       ":jni_headers",
       "//base",
       "//blimp/common/proto",
@@ -263,20 +282,20 @@ if (is_android) {
     ]
 
     sources = [
-      "android/blimp_jni_registrar.cc",
-      "android/blimp_jni_registrar.h",
-      "android/blimp_library_loader.cc",
-      "android/blimp_library_loader.h",
-      "android/blimp_view.cc",
-      "android/blimp_view.h",
-      "android/toolbar.cc",
-      "android/toolbar.h",
-      "compositor/blimp_compositor_android.cc",
-      "compositor/blimp_compositor_android.h",
-      "session/blimp_client_session_android.cc",
-      "session/blimp_client_session_android.h",
-      "session/tab_control_feature_android.cc",
-      "session/tab_control_feature_android.h",
+      "app/android/blimp_client_session_android.cc",
+      "app/android/blimp_client_session_android.h",
+      "app/android/blimp_compositor_android.cc",
+      "app/android/blimp_compositor_android.h",
+      "app/android/blimp_jni_registrar.cc",
+      "app/android/blimp_jni_registrar.h",
+      "app/android/blimp_library_loader.cc",
+      "app/android/blimp_library_loader.h",
+      "app/android/blimp_view.cc",
+      "app/android/blimp_view.h",
+      "app/android/tab_control_feature_android.cc",
+      "app/android/tab_control_feature_android.h",
+      "app/android/toolbar.cc",
+      "app/android/toolbar.h",
     ]
 
     libs = [ "android" ]

blimp/client/session/blimp_client_session_android.cc → blimp/client/app/android/blimp_client_session_android.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/session/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_client_session_android.h"
 
-#include "blimp/client/session/tab_control_feature.h"
+#include "blimp/client/feature/tab_control_feature.h"
 #include "jni/BlimpClientSession_jni.h"
 
 namespace blimp {

blimp/client/session/blimp_client_session_android.h → blimp/client/app/android/blimp_client_session_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_ANDROID_H_
-#define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_ANDROID_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_CLIENT_SESSION_ANDROID_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_CLIENT_SESSION_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
@@ -35,4 +35,4 @@ class BlimpClientSessionAndroid : public BlimpClientSession {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_ANDROID_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_CLIENT_SESSION_ANDROID_H_

blimp/client/compositor/blimp_compositor_android.cc → blimp/client/app/android/blimp_compositor_android.cc

@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/compositor/blimp_compositor_android.h"
+#include "blimp/client/app/android/blimp_compositor_android.h"
+
+#include <algorithm>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"

blimp/client/compositor/blimp_compositor_android.h → blimp/client/app/android/blimp_compositor_android.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_ANDROID_H_
-#define BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_ANDROID_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_COMPOSITOR_ANDROID_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_COMPOSITOR_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "blimp/client/compositor/blimp_compositor.h"
+#include "blimp/client/feature/compositor/blimp_compositor.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -72,4 +72,4 @@ class BlimpCompositorAndroid : public BlimpCompositor {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_ANDROID_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_COMPOSITOR_ANDROID_H_

blimp/client/android/blimp_jni_registrar.cc → blimp/client/app/android/blimp_jni_registrar.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/android/blimp_jni_registrar.h"
+#include "blimp/client/app/android/blimp_jni_registrar.h"
 
 #include "base/android/jni_registrar.h"
-#include "blimp/client/android/blimp_library_loader.h"
-#include "blimp/client/android/blimp_view.h"
-#include "blimp/client/android/toolbar.h"
-#include "blimp/client/session/blimp_client_session_android.h"
-#include "blimp/client/session/tab_control_feature_android.h"
+#include "blimp/client/app/android/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_library_loader.h"
+#include "blimp/client/app/android/blimp_view.h"
+#include "blimp/client/app/android/tab_control_feature_android.h"
+#include "blimp/client/app/android/toolbar.h"
 
 namespace blimp {
 namespace client {

blimp/client/android/blimp_jni_registrar.h → blimp/client/app/android/blimp_jni_registrar.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_ANDROID_BLIMP_JNI_REGISTRAR_H_
-#define BLIMP_CLIENT_ANDROID_BLIMP_JNI_REGISTRAR_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_JNI_REGISTRAR_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_JNI_REGISTRAR_H_
 
 #include <jni.h>
 
@@ -18,4 +18,4 @@ bool RegisterBlimpJni(JNIEnv* env);
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_ANDROID_BLIMP_JNI_REGISTRAR_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_JNI_REGISTRAR_H_

blimp/client/android/blimp_library_loader.cc → blimp/client/app/android/blimp_library_loader.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/android/blimp_library_loader.h"
+#include "blimp/client/app/android/blimp_library_loader.h"
 
 #include <vector>
 
@@ -12,8 +12,8 @@
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "blimp/client/android/blimp_jni_registrar.h"
-#include "blimp/client/blimp_startup.h"
+#include "blimp/client/app/android/blimp_jni_registrar.h"
+#include "blimp/client/app/blimp_startup.h"
 #include "jni/BlimpLibraryLoader_jni.h"
 #include "ui/gl/gl_surface.h"
 

blimp/client/android/blimp_library_loader.h → blimp/client/app/android/blimp_library_loader.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_ANDROID_BLIMP_LIBRARY_LOADER_H_
-#define BLIMP_CLIENT_ANDROID_BLIMP_LIBRARY_LOADER_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_LIBRARY_LOADER_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_LIBRARY_LOADER_H_
 
 #include <jni.h>
 
@@ -15,4 +15,4 @@ bool RegisterBlimpLibraryLoaderJni(JNIEnv* env);
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_ANDROID_BLIMP_LIBRARY_LOADER_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_LIBRARY_LOADER_H_

blimp/client/android/blimp_view.cc → blimp/client/app/android/blimp_view.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/android/blimp_view.h"
+#include "blimp/client/app/android/blimp_view.h"
 
 #include <android/native_window_jni.h>
 
-#include "blimp/client/compositor/blimp_compositor_android.h"
-#include "blimp/client/session/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_compositor_android.h"
 #include "jni/BlimpView_jni.h"
 #include "ui/events/android/motion_event_android.h"
 #include "ui/gfx/geometry/size.h"

blimp/client/android/blimp_view.h → blimp/client/app/android/blimp_view.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_ANDROID_BLIMP_VIEW_H_
-#define BLIMP_CLIENT_ANDROID_BLIMP_VIEW_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_VIEW_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_VIEW_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
@@ -110,4 +110,4 @@ class BlimpView {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_ANDROID_BLIMP_VIEW_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_VIEW_H_

blimp/client/session/tab_control_feature_android.cc → blimp/client/app/android/tab_control_feature_android.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/session/tab_control_feature_android.h"
+#include "blimp/client/app/android/tab_control_feature_android.h"
 
-#include "blimp/client/session/blimp_client_session_android.h"
-#include "blimp/client/session/tab_control_feature.h"
+#include "blimp/client/app/android/blimp_client_session_android.h"
+#include "blimp/client/feature/tab_control_feature.h"
 #include "jni/TabControlFeature_jni.h"
 #include "ui/gfx/geometry/size.h"
 

blimp/client/session/tab_control_feature_android.h → blimp/client/app/android/tab_control_feature_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_SESSION_TAB_CONTROL_FEATURE_ANDROID_H_
-#define BLIMP_CLIENT_SESSION_TAB_CONTROL_FEATURE_ANDROID_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_TAB_CONTROL_FEATURE_ANDROID_H_
+#define BLIMP_CLIENT_APP_ANDROID_TAB_CONTROL_FEATURE_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
@@ -13,6 +13,7 @@ namespace client {
 
 class TabControlFeature;
 
+// TODO(dtrainor): Document this class.
 class TabControlFeatureAndroid {
  public:
   static bool RegisterJni(JNIEnv* env);
@@ -44,4 +45,4 @@ class TabControlFeatureAndroid {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_TAB_CONTROL_FEATURE_ANDROID_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_TAB_CONTROL_FEATURE_ANDROID_H_

blimp/client/android/toolbar.cc → blimp/client/app/android/toolbar.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/android/toolbar.h"
+#include "blimp/client/app/android/toolbar.h"
 
 #include "base/android/jni_string.h"
-#include "blimp/client/session/blimp_client_session_android.h"
+#include "blimp/client/app/android/blimp_client_session_android.h"
 #include "jni/Toolbar_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"

blimp/client/android/toolbar.h → blimp/client/app/android/toolbar.h

@@ -2,12 +2,14 @@
 // 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;
@@ -61,4 +63,4 @@ class Toolbar : public NavigationFeature::NavigationFeatureDelegate {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_ANDROID_TOOLBAR_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_TOOLBAR_H_

blimp/client/blimp_client_switches.cc → blimp/client/app/blimp_client_switches.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/blimp_client_switches.h"
+#include "blimp/client/app/blimp_client_switches.h"
 
 namespace blimp {
 namespace switches {

blimp/client/blimp_client_switches.h → blimp/client/app/blimp_client_switches.h

@@ -4,8 +4,8 @@
 
 // Defines all the command-line switches used by //blimp.
 
-#ifndef BLIMP_CLIENT_BLIMP_CLIENT_SWITCHES_H_
-#define BLIMP_CLIENT_BLIMP_CLIENT_SWITCHES_H_
+#ifndef BLIMP_CLIENT_APP_BLIMP_CLIENT_SWITCHES_H_
+#define BLIMP_CLIENT_APP_BLIMP_CLIENT_SWITCHES_H_
 
 namespace blimp {
 namespace switches {
@@ -16,4 +16,4 @@ extern const char kBlimpletTCPPort[];
 }  // namespace switches
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_BLIMP_CLIENT_SWITCHES_H_
+#endif  // BLIMP_CLIENT_APP_BLIMP_CLIENT_SWITCHES_H_

blimp/client/blimp_startup.cc → blimp/client/app/blimp_startup.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/blimp_startup.h"
+#include "blimp/client/app/blimp_startup.h"
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"

blimp/client/blimp_startup.h → blimp/client/app/blimp_startup.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_BLIMP_STARTUP_H_
-#define BLIMP_CLIENT_BLIMP_STARTUP_H_
+#ifndef BLIMP_CLIENT_APP_BLIMP_STARTUP_H_
+#define BLIMP_CLIENT_APP_BLIMP_STARTUP_H_
 
 #include "blimp/client/blimp_client_export.h"
 
@@ -17,4 +17,4 @@ BLIMP_CLIENT_EXPORT bool InitializeMainMessageLoop();
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_BLIMP_STARTUP_H_
+#endif  // BLIMP_CLIENT_APP_BLIMP_STARTUP_H_

blimp/client/session/blimp_client_session_linux.cc → blimp/client/app/linux/blimp_client_session_linux.cc

@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/session/blimp_client_session_linux.h"
+#include "blimp/client/app/linux/blimp_client_session_linux.h"
+
+#include <string>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "blimp/client/linux/blimp_display_manager.h"
+#include "blimp/client/app/linux/blimp_display_manager.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/size.h"
 #include "url/gurl.h"

blimp/client/session/blimp_client_session_linux.h → blimp/client/app/linux/blimp_client_session_linux.h

@@ -2,13 +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_BLIMP_CLIENT_SESSION_LINUX_H_
-#define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_LINUX_H_
+#ifndef BLIMP_CLIENT_APP_LINUX_BLIMP_CLIENT_SESSION_LINUX_H_
+#define BLIMP_CLIENT_APP_LINUX_BLIMP_CLIENT_SESSION_LINUX_H_
 
 #include "base/macros.h"
-#include "blimp/client/linux/blimp_display_manager.h"
+#include "blimp/client/app/linux/blimp_display_manager.h"
+#include "blimp/client/feature/navigation_feature.h"
 #include "blimp/client/session/blimp_client_session.h"
-#include "blimp/client/session/navigation_feature.h"
 
 namespace ui {
 class PlatformEventSource;
@@ -38,4 +38,4 @@ class BlimpClientSessionLinux : public BlimpClientSession,
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_LINUX_H_
+#endif  // BLIMP_CLIENT_APP_LINUX_BLIMP_CLIENT_SESSION_LINUX_H_

blimp/client/linux/blimp_display_manager.cc → blimp/client/app/linux/blimp_display_manager.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/linux/blimp_display_manager.h"
+#include "blimp/client/app/linux/blimp_display_manager.h"
 
-#include "blimp/client/compositor/blimp_compositor.h"
-#include "blimp/client/session/render_widget_feature.h"
-#include "blimp/client/session/tab_control_feature.h"
+#include "blimp/client/feature/compositor/blimp_compositor.h"
+#include "blimp/client/feature/render_widget_feature.h"
+#include "blimp/client/feature/tab_control_feature.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/platform_window/platform_window.h"

blimp/client/linux/blimp_display_manager.h → blimp/client/app/linux/blimp_display_manager.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_
-#define BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_
+#ifndef BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_
+#define BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -65,4 +65,4 @@ class BlimpDisplayManager : public ui::PlatformWindowDelegate {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_LINUX_BLIMP_DISPLAY_MANAGER_H_
+#endif  // BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_

blimp/client/linux/blimp_main.cc → blimp/client/app/linux/blimp_main.cc

@@ -10,10 +10,10 @@
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
-#include "blimp/client/blimp_startup.h"
-#include "blimp/client/session/blimp_client_session_linux.h"
-#include "blimp/client/session/navigation_feature.h"
-#include "blimp/client/session/tab_control_feature.h"
+#include "blimp/client/app/blimp_startup.h"
+#include "blimp/client/app/linux/blimp_client_session_linux.h"
+#include "blimp/client/feature/navigation_feature.h"
+#include "blimp/client/feature/tab_control_feature.h"
 
 namespace {
 const char kDefaultUrl[] = "https://www.google.com";

blimp/client/compositor/blimp_compositor.cc → blimp/client/feature/compositor/blimp_compositor.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/compositor/blimp_compositor.h"
+#include "blimp/client/feature/compositor/blimp_compositor.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ -13,11 +13,11 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
-#include "blimp/client/compositor/blimp_context_provider.h"
-#include "blimp/client/compositor/blimp_layer_tree_settings.h"
-#include "blimp/client/compositor/blimp_output_surface.h"
-#include "blimp/client/compositor/test/dummy_layer_driver.h"
-#include "blimp/client/session/render_widget_feature.h"
+#include "blimp/client/feature/compositor/blimp_context_provider.h"
+#include "blimp/client/feature/compositor/blimp_layer_tree_settings.h"
+#include "blimp/client/feature/compositor/blimp_output_surface.h"
+#include "blimp/client/feature/compositor/test/dummy_layer_driver.h"
+#include "blimp/client/feature/render_widget_feature.h"
 #include "blimp/common/compositor/blimp_task_graph_runner.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_settings.h"

blimp/client/compositor/blimp_compositor.h → blimp/client/feature/compositor/blimp_compositor.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_H_
-#define BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_H_
+#ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_H_
+#define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 
 #include <vector>
 
@@ -11,8 +11,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "blimp/client/blimp_client_export.h"
-#include "blimp/client/input/blimp_input_manager.h"
-#include "blimp/client/session/render_widget_feature.h"
+#include "blimp/client/feature/compositor/blimp_input_manager.h"
+#include "blimp/client/feature/render_widget_feature.h"
 #include "cc/layers/layer_settings.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_settings.h"
@@ -182,4 +182,4 @@ class BLIMP_CLIENT_EXPORT BlimpCompositor
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_COMPOSITOR_BLIMP_COMPOSITOR_H_
+#endif  // BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_H_

blimp/client/compositor/blimp_context_provider.cc → blimp/client/feature/compositor/blimp_context_provider.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/compositor/blimp_context_provider.h"
+#include "blimp/client/feature/compositor/blimp_context_provider.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"

blimp/client/compositor/blimp_context_provider.h → blimp/client/feature/compositor/blimp_context_provider.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_COMPOSITOR_BLIMP_CONTEXT_PROVIDER_H_
-#define BLIMP_CLIENT_COMPOSITOR_BLIMP_CONTEXT_PROVIDER_H_
+#ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_CONTEXT_PROVIDER_H_
+#define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_CONTEXT_PROVIDER_H_
 
 #include <stdint.h>
 
@@ -63,4 +63,4 @@ class BlimpContextProvider : public cc::ContextProvider {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_COMPOSITOR_BLIMP_CONTEXT_PROVIDER_H_
+#endif  // BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_CONTEXT_PROVIDER_H_

blimp/client/input/blimp_input_handler_wrapper.cc → blimp/client/feature/compositor/blimp_input_handler_wrapper.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "blimp/client/input/blimp_input_handler_wrapper.h"
+#include "blimp/client/feature/compositor/blimp_input_handler_wrapper.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "blimp/client/input/blimp_input_manager.h"
+#include "blimp/client/feature/compositor/blimp_input_manager.h"
 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
 
 namespace blimp {