Use a qualified path for grit/content_resources.h.

The source file changes were done using:

  for f in $(git grep -l '"grit/content_resources.h"' -- '*.cc' '*.mm'); do
    sed -i -e 's/"grit\/content_resources.h"/"content\/grit\/content_resources.h"/' $f ;
  done
  tools/git/for-all-touched-files.py -c "tools/sort-headers.py -f [[FILENAME]]"

The gyp, gn, and DEPS changes were lovingly hand-crafted.

BUG=401588
R=thestig@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#290896}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290896 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 17 insertions, 16 deletions

diff --git a/content/BUILD.gn b/content/BUILD.gn
index 94c944d..88f705b 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -38,6 +38,7 @@ if (is_component_build) {
 
 grit("resources") {
   source = "content_resources.grd"
+  use_qualified_include = true
   outputs = [
     "grit/content_resources.h",
     "content_resources.pak",
diff --git a/content/DEPS b/content/DEPS
index 34616a4..acee5aa 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -5,6 +5,7 @@ include_rules = [
   # directories in content/ so we disallow all of them.
   "-content",
   "+content/common",
+  "+content/grit",
   "+content/public/common",
   "+content/public/test",
   "+content/shell",  # for content_browsertests
@@ -26,7 +27,6 @@ include_rules = [
 
   "+crypto",
   "+grit/blink_resources.h",
-  "+grit/content_resources.h",
   "+grit/content_strings.h",
   "+grit/ui_strings.h",
   "+grit/webkit_resources.h",
diff --git a/content/app/resources/BUILD.gn b/content/app/resources/BUILD.gn
index 967f919..c9de61e 100644
--- a/content/app/resources/BUILD.gn
+++ b/content/app/resources/BUILD.gn
@@ -6,6 +6,7 @@ import("//tools/grit/grit_rule.gni")
 
 grit("resources") {
   source = "content_resources.grd"
+  use_qualified_include = true
   outputs = [
     "grit/content_resources.h",
     "content_resources_100_percent.pak",
diff --git a/content/browser/accessibility/accessibility_ui.cc b/content/browser/accessibility/accessibility_ui.cc
index 155a1e9..db10133 100644
--- a/content/browser/accessibility/accessibility_ui.cc
+++ b/content/browser/accessibility/accessibility_ui.cc
@@ -17,6 +17,7 @@
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_message_enums.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
@@ -26,7 +27,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
 #include "net/base/escape.h"
 
 static const char kDataFile[] = "targets-data.json";
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index d2c3ca5..c338e02 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -16,6 +16,7 @@
 #include "base/values.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/web_contents.h"
@@ -27,7 +28,6 @@
 #include "content/public/common/url_constants.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_info.h"
-#include "grit/content_resources.h"
 #include "third_party/angle/src/common/version.h"
 
 #if defined(OS_WIN)
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index 1f80dda..4734673 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -11,6 +11,7 @@
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_manager.h"
@@ -20,7 +21,6 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
 #include "third_party/zlib/google/zip.h"
 #include "ui/base/text/bytes_formatting.h"
 #include "webkit/common/database/database_identifier.h"
diff --git a/content/browser/media/media_internals_ui.cc b/content/browser/media/media_internals_ui.cc
index f185bdc..3a5ac60 100644
--- a/content/browser/media/media_internals_ui.cc
+++ b/content/browser/media/media_internals_ui.cc
@@ -6,12 +6,12 @@
 
 #include "base/command_line.h"
 #include "content/browser/media/media_internals_handler.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
 
 namespace content {
 namespace {
diff --git a/content/browser/media/webrtc_internals_ui.cc b/content/browser/media/webrtc_internals_ui.cc
index 5c4adc5..6797030 100644
--- a/content/browser/media/webrtc_internals_ui.cc
+++ b/content/browser/media/webrtc_internals_ui.cc
@@ -5,11 +5,11 @@
 #include "content/browser/media/webrtc_internals_ui.h"
 
 #include "content/browser/media/webrtc_internals_message_handler.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
 
 namespace content {
 namespace {
diff --git a/content/browser/renderer_host/input/touch_emulator.cc b/content/browser/renderer_host/input/touch_emulator.cc
index 72975d7..c844203 100644
--- a/content/browser/renderer_host/input/touch_emulator.cc
+++ b/content/browser/renderer_host/input/touch_emulator.cc
@@ -7,9 +7,9 @@
 #include "content/browser/renderer_host/input/motion_event_web.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/common/input/web_touch_event_traits.h"
+#include "content/grit/content_resources.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "grit/content_resources.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "ui/events/gesture_detection/gesture_config_helper.h"
 #include "ui/gfx/image/image.h"
diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc
index a36cb66..b833f20 100644
--- a/content/browser/service_worker/service_worker_internals_ui.cc
+++ b/content/browser/service_worker/service_worker_internals_ui.cc
@@ -18,6 +18,7 @@
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_version.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
@@ -25,7 +26,6 @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/url_constants.h"
-#include "grit/content_resources.h"
 
 using base::DictionaryValue;
 using base::FundamentalValue;
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc
index 8b479a8..05fd1bb 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -9,8 +9,8 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_util.h"
+#include "content/grit/content_resources.h"
 #include "content/public/common/content_client.h"
-#include "grit/content_resources.h"
 #include "mojo/public/js/bindings/constants.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 12d4def..e6efad82 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -11,6 +11,7 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -26,7 +27,6 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
-#include "grit/content_resources.h"
 #include "mojo/common/test/test_utils.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index c7c1265..7b728de 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -31,9 +31,9 @@ extern "C" {
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
+#include "content/grit/content_resources.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "grit/content_resources.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "ui/base/layout.h"
 #include "ui/gl/gl_surface.h"
diff --git a/content/content_resources.gyp b/content/content_resources.gyp
index 273946e..4d248d9 100644
--- a/content/content_resources.gyp
+++ b/content/content_resources.gyp
@@ -23,7 +23,6 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 52e953f1..28ae253 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -61,6 +61,7 @@
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/common/worker_messages.h"
+#include "content/grit/content_resources.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
@@ -96,7 +97,6 @@
 #include "content/renderer/service_worker/embedded_worker_context_message_filter.h"
 #include "content/renderer/service_worker/embedded_worker_dispatcher.h"
 #include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
-#include "grit/content_resources.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_forwarding_message_filter.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc
index 70cd850..015cf4f 100644
--- a/content/test/webui_resource_browsertest.cc
+++ b/content/test/webui_resource_browsertest.cc
@@ -5,13 +5,13 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
+#include "content/grit/content_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
-#include "grit/content_resources.h"
 #include "grit/webui_resources.h"
 #include "net/base/filename_util.h"
 
diff --git a/extensions/DEPS b/extensions/DEPS
index 98f9058..67c2fd1 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -3,10 +3,10 @@ include_rules = [
   "+components/crx_file",
   "+components/url_matcher",
   "-content",
+  "+content/grit/content_resources.h",
   "+content/public/common",
   "+content/public/test",
   "+crypto",
-  "+grit/content_resources.h",
   "+grit/extensions_renderer_resources.h",
   "+grit/extensions_resources.h",
   "+mojo/public",
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index ef133398..c238ad7 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
+#include "content/grit/content_resources.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_thread.h"
@@ -75,7 +76,6 @@
 #include "extensions/renderer/user_gestures_native_handler.h"
 #include "extensions/renderer/utils_native_handler.h"
 #include "extensions/renderer/v8_context_native_handler.h"
-#include "grit/content_resources.h"
 #include "grit/extensions_renderer_resources.h"
 #include "mojo/public/js/bindings/constants.h"
 #include "third_party/WebKit/public/platform/WebString.h"