Roll DEPS for googleurl. Second try.

Roll DEPS for googleurl. Second try.

- Update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.

r184: Fix C++11 compilation on iOS
r185: Forward includes to url/

BUG=229660
R=thestig@chromium.org,brettw@chromium.org
TBR=darin@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203672

[tfarina, 2013-05-19 23:49:59]

Hi Lei, could you review this to me?

[tfarina, 2013-05-20 00:56:02]

Not sure how the chromeos failure is related to this CL:
lib/libchromeos.so: error: undefined reference to 'XFree'
Hum...

[Lei Zhang, 2013-05-20 19:05:56]

lgtm

https://codereview.chromium.org/15421002/diff/3013/build/temp_gyp/googleurl.gyp
File build/temp_gyp/googleurl.gyp (right):

https://codereview.chromium.org/15421002/diff/3013/build/temp_gyp/googleurl.g...
build/temp_gyp/googleurl.gyp:1: # Copyright (c) 2012 The Chromium Authors. All
rights reserved.
Is there anyone using this file after this CL? I assume it's going to get
removed in the near future.

https://codereview.chromium.org/15421002/diff/3013/chrome/chrome_browser_ui_v...
File chrome/chrome_browser_ui_views.gyp (right):

https://codereview.chromium.org/15421002/diff/3013/chrome/chrome_browser_ui_v...
chrome/chrome_browser_ui_views.gyp:12: '../url/url.gyp:url',
nit: move 2 lines down?

[tfarina, 2013-05-20 23:18:00]

https://codereview.chromium.org/15421002/diff/3013/build/temp_gyp/googleurl.gyp
File build/temp_gyp/googleurl.gyp (right):

https://codereview.chromium.org/15421002/diff/3013/build/temp_gyp/googleurl.g...
build/temp_gyp/googleurl.gyp:1: # Copyright (c) 2012 The Chromium Authors. All
rights reserved.
On 2013/05/20 19:05:56, Lei Zhang wrote:
> Is there anyone using this file after this CL? I assume it's going to get
> removed in the near future.
Yep, blink still references it, hence I can't remove it altogether in this
patch. After this lands and stick, I'll update blink. Then we need to wait for
roll of blink in chromium. Only after that I will be able to remove this file.

[tfarina, 2013-05-21 00:20:30]

https://codereview.chromium.org/15421002/diff/3013/chrome/chrome_browser_ui_v...
File chrome/chrome_browser_ui_views.gyp (right):

https://codereview.chromium.org/15421002/diff/3013/chrome/chrome_browser_ui_v...
chrome/chrome_browser_ui_views.gyp:12: '../url/url.gyp:url',
On 2013/05/20 19:05:56, Lei Zhang wrote:
> nit: move 2 lines down?
ops, yep!

[commit-bot: I haz the power, 2013-05-21 00:21:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/26001

[commit-bot: I haz the power, 2013-05-21 00:21:21]

Failed to apply patch for chrome/chrome_browser.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/chrome_browser.gypi
  Hunk #1 FAILED at 26.
  Hunk #2 succeeded at 51 (offset 1 line).
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/chrome_browser.gypi.rej

Patch:       chrome/chrome_browser.gypi
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index
911930edad287b0b18ff4f394e4907ccd69c77b0..16cf777e5b593ef3ea1ae5b7eacd8e53d38fd3aa
100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -26,14 +26,13 @@
         'safe_browsing_proto',
         'safe_browsing_report_proto',
         'variations_seed_proto',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../components/components.gyp:encryptor',
         '../components/components.gyp:sessions',
         '../components/components.gyp:user_prefs',
         '../components/components.gyp:visitedlink_browser',
         '../components/components.gyp:visitedlink_common',
-        '../components/components.gyp:webdata_common',
         '../components/components.gyp:web_modal',
+        '../components/components.gyp:webdata_common',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
@@ -50,14 +49,15 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
-        '../third_party/zlib/zlib.gyp:zip',
         '../third_party/zlib/zlib.gyp:minizip',
+        '../third_party/zlib/zlib.gyp:zip',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/ui.gyp:shell_dialogs',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
+        '../url/url.gyp:url',
         '../webkit/support/webkit_support.gyp:user_agent',
       ],
       'include_dirs': [

[tfarina, 2013-05-21 00:23:28]

TBRing Darin for this.

[commit-bot: I haz the power, 2013-05-21 00:23:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/31001

[commit-bot: I haz the power, 2013-05-21 00:38:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/31002

[commit-bot: I haz the power, 2013-05-21 01:00:21]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-05-21 02:00:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/4014

[commit-bot: I haz the power, 2013-05-21 02:35:30]

Retried try job too often on linux_chromeos for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-21 02:40:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/4014

[commit-bot: I haz the power, 2013-05-21 04:41:15]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-21 11:13:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/4014

[commit-bot: I haz the power, 2013-05-21 11:13:57]

Failed to apply patch for content/content_common_plugin.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  can't find file to patch at input line 6
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: content/content_common_plugin.gypi
  |diff --git a/content/content_common_plugin.gypi
b/content/content_common_plugin.gypi
  |index
4fcf28c428add2dfa7e0803965764c75b20567ea..9bc45be5dd5e216ce32f368d0277832f01d528c1
100644
  |--- a/content/content_common_plugin.gypi
  |+++ b/content/content_common_plugin.gypi
  --------------------------
  No file to patch.  Skipping patch.
  1 out of 1 hunk ignored

Patch:       content/content_common_plugin.gypi
Index: content/content_common_plugin.gypi
diff --git a/content/content_common_plugin.gypi
b/content/content_common_plugin.gypi
index
4fcf28c428add2dfa7e0803965764c75b20567ea..9bc45be5dd5e216ce32f368d0277832f01d528c1
100644
--- a/content/content_common_plugin.gypi
+++ b/content/content_common_plugin.gypi
@@ -5,9 +5,9 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
-    '../build/temp_gyp/googleurl.gyp:googleurl',
     '../components/tracing.gyp:tracing',
     '../ui/ui.gyp:ui',
+    '../url/url.gyp:url',
   ],
   'include_dirs': [
     '..',

[commit-bot: I haz the power, 2013-05-21 14:43:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/75001

[commit-bot: I haz the power, 2013-05-21 15:35:41]

Retried try job too often on linux_chromeos for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-21 16:00:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/75001

[commit-bot: I haz the power, 2013-05-21 16:42:54]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-21 16:46:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/75001

[commit-bot: I haz the power, 2013-05-21 17:37:29]

Retried try job too often on linux_chromeos for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-21 17:40:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/75001

[commit-bot: I haz the power, 2013-05-21 18:33:01]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-21 20:01:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/75001

[commit-bot: I haz the power, 2013-05-21 20:45:31]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[tfarina, 2013-05-21 20:48:02]

Lei I have no idea why browser_tests is failing on linux_chromeos for this
change.

Do you have any suggestion?

[Lei Zhang, 2013-05-21 21:04:55]

On 2013/05/21 20:48:02, tfarina wrote:
> Lei I have no idea why browser_tests is failing on linux_chromeos for this
> change.
> 
> Do you have any suggestion?

Not obvious to me why it's failing. I can try a build locally and see...

[Lei Zhang, 2013-05-21 21:47:03]

On 2013/05/21 21:04:55, Lei Zhang wrote:
> On 2013/05/21 20:48:02, tfarina wrote:
> > Lei I have no idea why browser_tests is failing on linux_chromeos for this
> > change.
> > 
> > Do you have any suggestion?
> 
> Not obvious to me why it's failing. I can try a build locally and see...

content_unittests fails locally here too, but not on the bots. Hmm... must go
deeper.

[Lei Zhang, 2013-05-21 22:56:57]

On 2013/05/21 21:47:03, Lei Zhang wrote:
> On 2013/05/21 21:04:55, Lei Zhang wrote:
> > On 2013/05/21 20:48:02, tfarina wrote:
> > > Lei I have no idea why browser_tests is failing on linux_chromeos for this
> > > change.
> > > 
> > > Do you have any suggestion?
> > 
> > Not obvious to me why it's failing. I can try a build locally and see...
> 
> content_unittests fails locally here too, but not on the bots. Hmm... must go
> deeper.

Well, it's your CL, I just don't understand why yet.

[Lei Zhang, 2013-05-22 01:36:34]

I suspect you have multiple copies of the static url/url.gyp:url target compiled
into various components. Thus there's is confusion when there are multiple
copies of globals and a bunch of tests fail as a result. 

Try making url/url.gyp:url  'type': '<(component)', and whatever else needs to
be done to make that build.

[commit-bot: I haz the power, 2013-05-23 13:24:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/75001

[Lei Zhang, 2013-05-23 13:48:24]

On 2013/05/23 13:24:19, I haz the power (commit-bot) wrote:
> CQ is trying da patch. Follow status at
> https://chromium-status.appspot.com/cq/tfarina%40chromium.org/15421002/75001

My CL got reverted. This isn't going to land yet.

[tfarina, 2013-05-23 15:57:03]

On Thu, May 23, 2013 at 10:48 AM,  <thestig@chromium.org> wrote:
>
> My CL got reverted. This isn't going to land yet.
>
I haven't saw it. Now I see it was reverted in r201755. Yeah, Windows
XP is the hell and there aren't trybots for it.

--
Thiago

[Lei Zhang, 2013-05-29 22:44:40]

You'll need to update url.gyp:url to url.gyp:url_lib, and very likely rebase as
well.

[tfarina, 2013-05-29 23:23:12]

On Wednesday, May 29, 2013, wrote:

> You'll need to update url.gyp:url to url.gyp:url_lib, and very likely
> rebase as
> well.

Yup. I'll update this as soon as your CL lands.


>
>
https://codereview.chromium.**org/15421002/<https://codereview.chromium.org/1...
>


-- 
Thiago

[tfarina, 2013-06-01 17:17:19]

Updated, rebased and url -> url_lib. I'm happy that Lei's change sticked!

I'll reland this when the tree reopens, unfortunately it's closed this weekend.

[commit-bot: I haz the power, 2013-06-02 21:25:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/118001

[commit-bot: I haz the power, 2013-06-02 22:03:57]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-02 22:10:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/124003

[commit-bot: I haz the power, 2013-06-02 22:58:04]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-03 01:43:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/133001

[commit-bot: I haz the power, 2013-06-03 02:40:37]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win7_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-03 03:04:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tfarina@chromium.org/15421002/149001

[commit-bot: I haz the power, 2013-06-03 05:40:30]

Change committed as 203672

[Lei Zhang, 2013-06-03 06:07:15]

On 2013/06/03 05:40:30, I haz the power (commit-bot) wrote:
> Change committed as 203672

Woohoo!