From b9d2064f6eacff6db4af281df0b0db0a6b2199be Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 19 Sep 2012 23:08:50 +0000
Subject: [PATCH] Roll Chromium 152335:157509, and add google_apis/build.

- gitignore google_apis.
- Disable 4005 warning in gflags.gyp.

TBR=niklas.enbom, kjellander
TESTED=trybots

Review URL: https://webrtc-codereview.appspot.com/819004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2792 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .gitignore                                  | 1 +
 DEPS                                        | 6 +++++-
 third_party/google-gflags/google-gflags.gyp | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29ef23ef8d..968e9467cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
 .settings
 /build
 /chromium_deps
+/google_apis
 /gyp-mac-tool
 /Makefile
 /out
diff --git a/DEPS b/DEPS
index 424093d148..05b39342b1 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@ vars = {
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "152335",
+  "chromium_revision": "157509",
 
   # External resources like video and audio files used for testing purposes.
   # Downloaded on demand when needed.
@@ -26,6 +26,10 @@ deps = {
   "build":
     Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
 
+  # Needed by common.gypi.
+  "google_apis/build":
+    Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
+
   "testing":
     Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
 
diff --git a/third_party/google-gflags/google-gflags.gyp b/third_party/google-gflags/google-gflags.gyp
index 211280a041..23b3c4d9c2 100644
--- a/third_party/google-gflags/google-gflags.gyp
+++ b/third_party/google-gflags/google-gflags.gyp
@@ -51,10 +51,12 @@
         'src/gflags_reporting.cc',
       ],
       'conditions': [
-        ['OS == "win"', {
+        ['OS=="win"', {
           'sources': [
             'src/windows/port.cc',
           ],
+          # Suppress warnings about WIN32_LEAN_AND_MEAN.
+          'msvs_disabled_warnings': [4005,],
         }],
         # TODO(andrew): Look into fixing this warning upstream:
         # http://code.google.com/p/webrtc/issues/detail?id=760