Reorganize apps/shell into app, browser and common directories.

This allows us to separate browser process, render process and common code, similar to how content/shell is organized.  This also allows the DEPS files to be more restrictive to enforce those dependencies.

A parallel CL adds apps/shell/renderer and some renderer-specific code: https://codereview.chromium.org/149163002/

BUG=none
TEST=compiles
R=joi@chromium.org, miket@chromium.org
TBR=stevenjb@chromium.org for DEPS on src/chromeos (just moving the DEP from one file to another)

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248575 0039d316-1c4b-4281-b951-d872f2087c98

29 files changed, 120 insertions, 85 deletions

diff --git a/apps/DEPS b/apps/DEPS
index 947c471..622baae 100644
--- a/apps/DEPS
+++ b/apps/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+base",
-  "+content/public/app",
   "+content/public/browser",
   "+content/public/common",
   "+content/public/test",
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 393b9fe..80f2fca 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -124,29 +124,29 @@
             '..',
           ],
           'sources': [
+            'shell/app/shell_main_delegate.cc',
+            'shell/app/shell_main_delegate.h',
+            'shell/app/shell_main.cc',
+            'shell/browser/shell_app_sorting.cc',
+            'shell/browser/shell_app_sorting.h',
+            'shell/browser/shell_browser_context.cc',
+            'shell/browser/shell_browser_context.h',
+            'shell/browser/shell_browser_main_parts.cc',
+            'shell/browser/shell_browser_main_parts.h',
+            'shell/browser/shell_content_browser_client.cc',
+            'shell/browser/shell_content_browser_client.h',
+            'shell/browser/shell_extension_system.cc',
+            'shell/browser/shell_extension_system.h',
+            'shell/browser/shell_extensions_browser_client.cc',
+            'shell/browser/shell_extensions_browser_client.h',
+            'shell/browser/web_view_window.cc',
+            'shell/browser/web_view_window.cc',
+            'shell/common/shell_content_client.cc',
+            'shell/common/shell_content_client.h',
+            'shell/common/shell_extensions_client.cc',
+            'shell/common/shell_extensions_client.h',
             'shell/renderer/shell_content_renderer_client.cc',
             'shell/renderer/shell_content_renderer_client.h',
-            'shell/shell_app_sorting.cc',
-            'shell/shell_app_sorting.h',
-            'shell/shell_browser_context.cc',
-            'shell/shell_browser_context.h',
-            'shell/shell_browser_main_parts.cc',
-            'shell/shell_browser_main_parts.h',
-            'shell/shell_content_browser_client.cc',
-            'shell/shell_content_browser_client.h',
-            'shell/shell_content_client.cc',
-            'shell/shell_content_client.h',
-            'shell/shell_extension_system.cc',
-            'shell/shell_extension_system.h',
-            'shell/shell_extensions_browser_client.cc',
-            'shell/shell_extensions_browser_client.h',
-            'shell/shell_extensions_client.cc',
-            'shell/shell_extensions_client.h',
-            'shell/shell_main_delegate.cc',
-            'shell/shell_main_delegate.h',
-            'shell/shell_main.cc',
-            'shell/web_view_window.cc',
-            'shell/web_view_window.cc',
           ],
         },
       ],  # targets
diff --git a/apps/shell/app/DEPS b/apps/shell/app/DEPS
new file mode 100644
index 0000000..34169e4
--- /dev/null
+++ b/apps/shell/app/DEPS
@@ -0,0 +1,13 @@
+include_rules = [
+  # TODO(jamescook): Remove these. http://crbug.com/305404
+  # Chrome pieces for app_shell bring-up.
+  "+chrome/common/chrome_paths.h",
+
+  "+chromeos",
+
+  # Override apps/DEPS to be more selective about content includes.
+  "-content",
+  "+content/public/app",
+  "+content/public/browser",
+  "+content/public/common",
+]
diff --git a/apps/shell/app/README b/apps/shell/app/README
new file mode 100644
index 0000000..9dbba28
--- /dev/null
+++ b/apps/shell/app/README
@@ -0,0 +1,5 @@
+"Application support" for the app_shell executable.
+
+This directory has nothing to do with the apps/extensions themselves.
+
+See content/shell/app for a similar example.
diff --git a/apps/shell/shell_main.cc b/apps/shell/app/shell_main.cc
index 4048c17..c81cfa0 100644
--- a/apps/shell/shell_main.cc
+++ b/apps/shell/app/shell_main.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 "apps/shell/shell_main_delegate.h"
+#include "apps/shell/app/shell_main_delegate.h"
 #include "content/public/app/content_main.h"
 
 int main(int argc, const char** argv) {
diff --git a/apps/shell/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index 23c91fa..964c4c5 100644
--- a/apps/shell/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.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 "apps/shell/shell_main_delegate.h"
+#include "apps/shell/app/shell_main_delegate.h"
 
+#include "apps/shell/browser/shell_content_browser_client.h"
+#include "apps/shell/common/shell_content_client.h"
 #include "apps/shell/renderer/shell_content_renderer_client.h"
-#include "apps/shell/shell_content_browser_client.h"
-#include "apps/shell/shell_content_client.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
diff --git a/apps/shell/shell_main_delegate.h b/apps/shell/app/shell_main_delegate.h
index 14f5658..6af9395 100644
--- a/apps/shell/shell_main_delegate.h
+++ b/apps/shell/app/shell_main_delegate.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 APPS_SHELL_SHELL_MAIN_DELEGATE_H_
-#define APPS_SHELL_SHELL_MAIN_DELEGATE_H_
+#ifndef APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
+#define APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -44,4 +44,4 @@ class ShellMainDelegate : public content::ContentMainDelegate {
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_MAIN_DELEGATE_H_
+#endif  // APPS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
diff --git a/apps/shell/DEPS b/apps/shell/browser/DEPS
index 8d6b630..be6d6d9 100644
--- a/apps/shell/DEPS
+++ b/apps/shell/browser/DEPS
@@ -1,18 +1,23 @@
 include_rules = [
-  "+chromeos",
-  "+components/user_prefs",
-  "+sync/api",
-  "+webkit/common/user_agent/user_agent_util.h",
-
   # TODO(jamescook): Remove these. http://crbug.com/305404
-  # Chrome pieces for bring-up.
+  # Chrome pieces for app_shell bring-up.
   "+chrome/browser/extensions/extension_protocols.h",
   "+chrome/browser/extensions/extension_resource_protocols.h",
   "+chrome/common/chrome_paths.h",
-  "+chrome/common/extensions/extension_file_util.h",
   "+chrome/common/extensions/features/base_feature_provider.h",
-  "+chrome/common/extensions/permissions/chrome_api_permissions.h",
+  "+chrome/common/extensions/extension_file_util.h",
+
+  "+chromeos",
+  "+components/user_prefs",
+
+  # Override apps/DEPS to be more selective about content includes.
+  "-content",
+  "+content/public/browser",
+  "+content/public/common",
+  "+content/public/test",
 
   # Pieces of content_shell reused in app_shell.
   "+content/shell/browser/shell_browser_context.h",
+
+  "+sync/api",
 ]
diff --git a/apps/shell/shell_app_sorting.cc b/apps/shell/browser/shell_app_sorting.cc
index d792da3..b78d57d 100644
--- a/apps/shell/shell_app_sorting.cc
+++ b/apps/shell/browser/shell_app_sorting.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 "apps/shell/shell_app_sorting.h"
+#include "apps/shell/browser/shell_app_sorting.h"
 
 #include "sync/api/string_ordinal.h"
 
diff --git a/apps/shell/shell_app_sorting.h b/apps/shell/browser/shell_app_sorting.h
index e00dc15..461a3ed 100644
--- a/apps/shell/shell_app_sorting.h
+++ b/apps/shell/browser/shell_app_sorting.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 APPS_SHELL_SHELL_APP_SORTING_H_
-#define APPS_SHELL_SHELL_APP_SORTING_H_
+#ifndef APPS_SHELL_BROWSER_SHELL_APP_SORTING_H_
+#define APPS_SHELL_BROWSER_SHELL_APP_SORTING_H_
 
 #include "base/compiler_specific.h"
 #include "extensions/browser/app_sorting.h"
@@ -61,4 +61,4 @@ class ShellAppSorting : public extensions::AppSorting {
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_APP_SORTING_H_
+#endif  // APPS_SHELL_BROWSER_SHELL_APP_SORTING_H_
diff --git a/apps/shell/shell_browser_context.cc b/apps/shell/browser/shell_browser_context.cc
index 77aa96f..90c401e 100644
--- a/apps/shell/shell_browser_context.cc
+++ b/apps/shell/browser/shell_browser_context.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 "apps/shell/shell_browser_context.h"
+#include "apps/shell/browser/shell_browser_context.h"
 
 namespace apps {
 
diff --git a/apps/shell/shell_browser_context.h b/apps/shell/browser/shell_browser_context.h
index 120a6b5..cab69f6 100644
--- a/apps/shell/shell_browser_context.h
+++ b/apps/shell/browser/shell_browser_context.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 APPS_SHELL_SHELL_BROWSER_CONTEXT_H_
-#define APPS_SHELL_SHELL_BROWSER_CONTEXT_H_
+#ifndef APPS_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_
+#define APPS_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_
 
 #include "base/compiler_specific.h"
 #include "content/shell/browser/shell_browser_context.h"
@@ -41,4 +41,4 @@ class ShellBrowserContext : public content::ShellBrowserContext {
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_BROWSER_CONTEXT_H_
+#endif  // APPS_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_
diff --git a/apps/shell/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index 27d4a76..343cfa2 100644
--- a/apps/shell/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "apps/shell/shell_browser_main_parts.h"
+#include "apps/shell/browser/shell_browser_main_parts.h"
 
-#include "apps/shell/shell_browser_context.h"
-#include "apps/shell/shell_extension_system.h"
-#include "apps/shell/shell_extensions_browser_client.h"
-#include "apps/shell/shell_extensions_client.h"
-#include "apps/shell/web_view_window.h"
+#include "apps/shell/browser/shell_browser_context.h"
+#include "apps/shell/browser/shell_extension_system.h"
+#include "apps/shell/browser/shell_extensions_browser_client.h"
+#include "apps/shell/browser/web_view_window.h"
+#include "apps/shell/common/shell_extensions_client.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
diff --git a/apps/shell/shell_browser_main_parts.h b/apps/shell/browser/shell_browser_main_parts.h
index 62ff772..59419b9 100644
--- a/apps/shell/shell_browser_main_parts.h
+++ b/apps/shell/browser/shell_browser_main_parts.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 APPS_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
-#define APPS_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
+#ifndef APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
+#define APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -91,4 +91,4 @@ class ShellBrowserMainParts : public content::BrowserMainParts,
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
+#endif  // APPS_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
diff --git a/apps/shell/shell_content_browser_client.cc b/apps/shell/browser/shell_content_browser_client.cc
index e6486b5..df747b3 100644
--- a/apps/shell/shell_content_browser_client.cc
+++ b/apps/shell/browser/shell_content_browser_client.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 "apps/shell/shell_content_browser_client.h"
+#include "apps/shell/browser/shell_content_browser_client.h"
 
-#include "apps/shell/shell_browser_context.h"
-#include "apps/shell/shell_browser_main_parts.h"
-#include "apps/shell/shell_extension_system.h"
+#include "apps/shell/browser/shell_browser_context.h"
+#include "apps/shell/browser/shell_browser_main_parts.h"
+#include "apps/shell/browser/shell_extension_system.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/extension_resource_protocols.h"
diff --git a/apps/shell/shell_content_browser_client.h b/apps/shell/browser/shell_content_browser_client.h
index 4fede7d..e3dc619 100644
--- a/apps/shell/shell_content_browser_client.h
+++ b/apps/shell/browser/shell_content_browser_client.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 APPS_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
-#define APPS_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
+#ifndef APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
+#define APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "content/public/browser/content_browser_client.h"
@@ -54,4 +54,4 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
+#endif  // APPS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
diff --git a/apps/shell/shell_extension_system.cc b/apps/shell/browser/shell_extension_system.cc
index 1e009a3..b75018b 100644
--- a/apps/shell/shell_extension_system.cc
+++ b/apps/shell/browser/shell_extension_system.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 "apps/shell/shell_extension_system.h"
+#include "apps/shell/browser/shell_extension_system.h"
 
 #include <string>
 
diff --git a/apps/shell/shell_extension_system.h b/apps/shell/browser/shell_extension_system.h
index 62dd752..0d90174 100644
--- a/apps/shell/shell_extension_system.h
+++ b/apps/shell/browser/shell_extension_system.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 APPS_SHELL_SHELL_EXTENSION_SYSTEM_H_
-#define APPS_SHELL_SHELL_EXTENSION_SYSTEM_H_
+#ifndef APPS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
+#define APPS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
 
 #include <vector>
 
@@ -89,4 +89,4 @@ class ShellExtensionSystem : public ExtensionSystem {
 
 }  // namespace extensions
 
-#endif  // APPS_SHELL_SHELL_EXTENSION_SYSTEM_H_
+#endif  // APPS_SHELL_BROWSER_SHELL_EXTENSION_SYSTEM_H_
diff --git a/apps/shell/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc
index 1af1b2a..0ed1f1b 100644
--- a/apps/shell/shell_extensions_browser_client.cc
+++ b/apps/shell/browser/shell_extensions_browser_client.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 "apps/shell/shell_extensions_browser_client.h"
+#include "apps/shell/browser/shell_extensions_browser_client.h"
 
-#include "apps/shell/shell_app_sorting.h"
-#include "apps/shell/shell_extension_system.h"
+#include "apps/shell/browser/shell_app_sorting.h"
+#include "apps/shell/browser/shell_extension_system.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
diff --git a/apps/shell/shell_extensions_browser_client.h b/apps/shell/browser/shell_extensions_browser_client.h
index 86781b5..106ccc7 100644
--- a/apps/shell/shell_extensions_browser_client.h
+++ b/apps/shell/browser/shell_extensions_browser_client.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 APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
-#define APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
+#ifndef APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
+#define APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "extensions/browser/extensions_browser_client.h"
@@ -63,4 +63,4 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
 
 }  // namespace extensions
 
-#endif  // APPS_SHELL_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
+#endif  // APPS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_
diff --git a/apps/shell/web_view_window.cc b/apps/shell/browser/web_view_window.cc
index 91e8049..cee375e 100644
--- a/apps/shell/web_view_window.cc
+++ b/apps/shell/browser/web_view_window.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 "apps/shell/web_view_window.h"
+#include "apps/shell/browser/web_view_window.h"
 
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
diff --git a/apps/shell/web_view_window.h b/apps/shell/browser/web_view_window.h
index cfe2e07..b785ed7 100644
--- a/apps/shell/web_view_window.h
+++ b/apps/shell/browser/web_view_window.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 APPS_SHELL_WEB_VIEW_WINDOW_H_
-#define APPS_SHELL_WEB_VIEW_WINDOW_H_
+#ifndef APPS_SHELL_BROWSER_WEB_VIEW_WINDOW_H_
+#define APPS_SHELL_BROWSER_WEB_VIEW_WINDOW_H_
 
 namespace aura {
 class Window;
@@ -21,4 +21,4 @@ void ShowWebViewWindow(content::BrowserContext* browser_context,
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_WEB_VIEW_WINDOW_H_
+#endif  // APPS_SHELL_BROWSER_WEB_VIEW_WINDOW_H_
diff --git a/apps/shell/common/DEPS b/apps/shell/common/DEPS
new file mode 100644
index 0000000..cf709d6
--- /dev/null
+++ b/apps/shell/common/DEPS
@@ -0,0 +1,13 @@
+include_rules = [
+  # TODO(jamescook): Remove these. http://crbug.com/305404
+  # Chrome pieces for app_shell bring-up.
+  "+chrome/common/extensions/features/base_feature_provider.h",
+  "+chrome/common/extensions/permissions/chrome_api_permissions.h",
+
+  # Override apps/DEPS to be more selective about content includes.
+  "-content",
+  "+content/public/common",
+  "+content/public/test",
+
+  "+webkit/common/user_agent/user_agent_util.h",
+]
diff --git a/apps/shell/shell_content_client.cc b/apps/shell/common/shell_content_client.cc
index 7ec4b0e..6b5446f 100644
--- a/apps/shell/shell_content_client.cc
+++ b/apps/shell/common/shell_content_client.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 "apps/shell/shell_content_client.h"
+#include "apps/shell/common/shell_content_client.h"
 
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/apps/shell/shell_content_client.h b/apps/shell/common/shell_content_client.h
index 6010e78..01a52a4 100644
--- a/apps/shell/shell_content_client.h
+++ b/apps/shell/common/shell_content_client.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 APPS_SHELL_SHELL_CONTENT_CLIENT_H_
-#define APPS_SHELL_SHELL_CONTENT_CLIENT_H_
+#ifndef APPS_SHELL_COMMON_SHELL_CONTENT_CLIENT_H_
+#define APPS_SHELL_COMMON_SHELL_CONTENT_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "content/public/common/content_client.h"
@@ -30,4 +30,4 @@ class ShellContentClient : public content::ContentClient {
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_CONTENT_CLIENT_H_
+#endif  // APPS_SHELL_COMMON_SHELL_CONTENT_CLIENT_H_
diff --git a/apps/shell/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc
index ffd63b4..2b2619e 100644
--- a/apps/shell/shell_extensions_client.cc
+++ b/apps/shell/common/shell_extensions_client.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 "apps/shell/shell_extensions_client.h"
+#include "apps/shell/common/shell_extensions_client.h"
 
 #include "base/logging.h"
 #include "chrome/common/extensions/features/base_feature_provider.h"
diff --git a/apps/shell/shell_extensions_client.h b/apps/shell/common/shell_extensions_client.h
index 1ed3697..9d5e01e 100644
--- a/apps/shell/shell_extensions_client.h
+++ b/apps/shell/common/shell_extensions_client.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 APPS_SHELL_SHELL_EXTENSIONS_CLIENT_H_
-#define APPS_SHELL_SHELL_EXTENSIONS_CLIENT_H_
+#ifndef APPS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
+#define APPS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -46,4 +46,4 @@ class ShellExtensionsClient : public extensions::ExtensionsClient {
 
 }  // namespace apps
 
-#endif  // APPS_SHELL_SHELL_EXTENSIONS_CLIENT_H_
+#endif  // APPS_SHELL_COMMON_SHELL_EXTENSIONS_CLIENT_H_
diff --git a/apps/shell/renderer/DEPS b/apps/shell/renderer/DEPS
index b201ed5..01eda61 100644
--- a/apps/shell/renderer/DEPS
+++ b/apps/shell/renderer/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   # Only allow includes the renderer can use.
-  "-content/public/browser",
+  "-content",
   "+content/public/common",
   "+content/public/renderer",
   "+content/public/test",
diff --git a/apps/shell/renderer/shell_content_renderer_client.cc b/apps/shell/renderer/shell_content_renderer_client.cc
index 025a104c..4e437cc 100644
--- a/apps/shell/renderer/shell_content_renderer_client.cc
+++ b/apps/shell/renderer/shell_content_renderer_client.cc
@@ -4,7 +4,7 @@
 
 #include "apps/shell/renderer/shell_content_renderer_client.h"
 
-#include "apps/shell/shell_extensions_client.h"
+#include "apps/shell/common/shell_extensions_client.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/extension_helper.h"
 #include "content/public/renderer/render_thread.h"