Use a qualified path to blink resources, content part.

This should prevent problems such as described in

  [chromium-dev] PSA: clobber build needed for IDR_INSPECTOR_*
                 compile errors in blink_platform_impl.cc

Depends on https://codereview.chromium.org/431883002

BUG=400860
TBR=brettw

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

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

build/secondary/tools/grit/grit_rule.gni

@@ -41,6 +41,9 @@
 #   output_dir (optional)
 #     Directory for generated files.
 #
+#   use_qualified_include (optional)
+#     If set, output_dir is not added to include_dirs.
+#
 #   deps  (optional)
 #   visibility  (optional)
 #       Normal meaning.
@@ -247,7 +250,10 @@ template("grit") {
   # (like "mycomponent/foo.h"). This config sets up the include path.
   grit_config = target_name + "_grit_config"
   config(grit_config) {
-    include_dirs = [ output_dir ]
+    if (!defined(invoker.use_qualified_include) ||
+        !invoker.use_qualified_include) {
+      include_dirs = [ output_dir ]
+    }
     visibility = target_visibility
   }
 

content/DEPS

@@ -15,6 +15,8 @@ include_rules = [
   # being used as a parallel API to the Content API.
   "-base/prefs",
 
+  "+blink",
+
   "+cc",
   # If you want to use any of these files, move them to src/base first.
   "-cc/base/scoped_ptr_algorithm.h",

content/child/blink_platform_impl.cc

@@ -26,6 +26,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
+#include "blink/public/resources/grit/blink_resources.h"
 #include "content/child/child_thread.h"
 #include "content/child/content_child_helpers.h"
 #include "content/child/fling_curve_configuration.h"
@@ -36,7 +37,6 @@
 #include "content/child/webthread_impl.h"
 #include "content/child/worker_task_runner.h"
 #include "content/public/common/content_client.h"
-#include "grit/blink_resources.h"
 #include "grit/webkit_resources.h"
 #include "grit/webkit_strings.h"
 #include "net/base/data_url.h"