Remove storage-related redirect headers in webkit/common/, update #includes and DEPS files to use s…

Remove storage-related redirect headers in webkit/common/, update #includes and DEPS files to use storage/ directly

BUG=338338
TBR=darin@chromium.org

Committed: https://crrev.com/1633055f41870196bb13958dd67185378d15c2c6
Cr-Commit-Position: refs/heads/master@{#294067}

[pilgrim_google, 2014-09-09 15:25:47]

pilgrim@chromium.org changed reviewers:
+ jam@chromium.org, jamesr@chromium.org, michaeln@chromium.org

[jamesr, 2014-09-09 18:21:51]

https://codereview.chromium.org/553983013/diff/20001/android_webview/DEPS
File android_webview/DEPS (left):

https://codereview.chromium.org/553983013/diff/20001/android_webview/DEPS#old...
android_webview/DEPS:22: "+webkit",
why this change?

https://codereview.chromium.org/553983013/diff/20001/chrome/browser/DEPS
File chrome/browser/DEPS (left):

https://codereview.chromium.org/553983013/diff/20001/chrome/browser/DEPS#oldc...
chrome/browser/DEPS:126: "+webkit/common",
NAK.  It's very important that chrome/browser/ depend only on things in
../common/ and ../browser/.  If we start pulling in stuff that links in blink we
could muck up the windows split dll build (i.e. the official one)

[jamesr, 2014-09-09 18:41:59]

Code changes lgtm but you need to tighten up the DEPS before landing.  We don't
(yet) have a better way to maintain the split dll build so we rely on having
tight DEPS rules to help developers not make mistakes.

https://codereview.chromium.org/553983013/diff/20001/content/DEPS
File content/DEPS (right):

https://codereview.chromium.org/553983013/diff/20001/content/DEPS#newcode110
content/DEPS:110: "+storage",
can this be storage/common/ and add /browser/ to content/browser/DEPS ?

[pilgrim_google, 2014-09-09 18:42:06]

On 2014/09/09 18:21:51, jamesr wrote:
> https://codereview.chromium.org/553983013/diff/20001/android_webview/DEPS
> File android_webview/DEPS (left):
> 
>
https://codereview.chromium.org/553983013/diff/20001/android_webview/DEPS#old...
> android_webview/DEPS:22: "+webkit",
> why this change?

Oops, fixed.

> 
> https://codereview.chromium.org/553983013/diff/20001/chrome/browser/DEPS
> File chrome/browser/DEPS (left):
> 
>
https://codereview.chromium.org/553983013/diff/20001/chrome/browser/DEPS#oldc...
> chrome/browser/DEPS:126: "+webkit/common",
> NAK.  It's very important that chrome/browser/ depend only on things in
> ../common/ and ../browser/.  If we start pulling in stuff that links in blink
we
> could muck up the windows split dll build (i.e. the official one)

Also fixed.

[jamesr, 2014-09-09 18:47:12]

almost!

https://codereview.chromium.org/553983013/diff/40001/chrome/browser/DEPS
File chrome/browser/DEPS (right):

https://codereview.chromium.org/553983013/diff/40001/chrome/browser/DEPS#newc...
chrome/browser/DEPS:125: "+storage",
this too. since this is chrome/browser/, it should only be including
storage/common and storage/browser. anything we put in storage/ that depends on
blink proper should not be included here. better to restrict now

[pilgrim_google, 2014-09-09 18:48:05]

On 2014/09/09 18:41:59, jamesr wrote:
> https://codereview.chromium.org/553983013/diff/20001/content/DEPS
> File content/DEPS (right):
> 
> https://codereview.chromium.org/553983013/diff/20001/content/DEPS#newcode110
> content/DEPS:110: "+storage",
> can this be storage/common/ and add /browser/ to content/browser/DEPS ?

Done. (Actually just changed it to storage/common/, but I will take your advice
and add storage/browser/ to content/browser/DEPS when I migrate webkit/browser/
stuff later.)

[jamesr, 2014-09-09 18:48:56]

OK great. lgtm

[pilgrim_google, 2014-09-09 18:50:37]

On 2014/09/09 18:47:12, jamesr wrote:
> almost!
> 
> https://codereview.chromium.org/553983013/diff/40001/chrome/browser/DEPS
> File chrome/browser/DEPS (right):
> 
>
https://codereview.chromium.org/553983013/diff/40001/chrome/browser/DEPS#newc...
> chrome/browser/DEPS:125: "+storage",
> this too. since this is chrome/browser/, it should only be including
> storage/common and storage/browser. anything we put in storage/ that depends
on
> blink proper should not be included here. better to restrict now

Done. (Changed to storage/common/ for now. Will add storage/browser when I
remove webkit/browser, later.)

[pilgrim_google, 2014-09-09 18:56:26]

The CQ bit was checked by pilgrim@chromium.org

[commit-bot: I haz the power, 2014-09-09 19:00:11]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/pilgrim@chromium.org/553983013/100001

[commit-bot: I haz the power, 2014-09-09 22:12:50]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-09 22:12:52]

Try jobs failed on following builders:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[pilgrim_google, 2014-09-09 22:31:18]

The CQ bit was checked by pilgrim@chromium.org

[commit-bot: I haz the power, 2014-09-09 22:33:22]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/pilgrim@chromium.org/553983013/100001

[commit-bot: I haz the power, 2014-09-09 23:55:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-09 23:55:33]

Failed to apply patch for
chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc:19
  error:
chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc:
patch does not apply

Patch:      
chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
Index:
chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
diff --git
a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
index
56dc1a38e37520c7e1c8a920a153a60468e795c2..4e94da5a462182ae934a814fc6c558b635585b72
100644
---
a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
+++
b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
@@ -19,8 +19,8 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/common/extension.h"
+#include "storage/common/fileapi/file_system_types.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/common/fileapi/file_system_types.h"
 
 namespace utils = extension_function_test_utils;

[pilgrim_google, 2014-09-10 00:11:57]

The CQ bit was checked by pilgrim@chromium.org

[commit-bot: I haz the power, 2014-09-10 00:14:19]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/pilgrim@chromium.org/553983013/120001

[commit-bot: I haz the power, 2014-09-10 01:33:57]

Committed patchset #7 (id:120001) as cc825f30a920f695a5dbf5a334598ec3d5c08f29

[commit-bot: I haz the power, 2014-09-10 03:57:27]

Patchset 7 (id:??) landed as
https://crrev.com/1633055f41870196bb13958dd67185378d15c2c6
Cr-Commit-Position: refs/heads/master@{#294067}