From e8f90680700fd2f7eb4678c4282426f4b9abe053 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 6 Dec 2012 20:56:53 +0000
Subject: [PATCH] Merge revision 944 changes: - Linux: Fix compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1271@945 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef3/cef.gypi                                    | 8 +++++++-
 cef3/libcef/browser/url_request_context_getter.h | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cef3/cef.gypi b/cef3/cef.gypi
index c3f8cce3d..924bb1d9e 100644
--- a/cef3/cef.gypi
+++ b/cef3/cef.gypi
@@ -18,5 +18,11 @@
         'clang_use_chrome_plugins': 0,
       }],
     ]
-  },
+  }, 'conditions': [
+    ['os_posix==1 and OS!="mac" and OS!="android"', {
+      'target_defaults': {
+        'cflags_cc': ['-Wno-deprecated-declarations'],
+      },
+    }],
+  ]
 }
diff --git a/cef3/libcef/browser/url_request_context_getter.h b/cef3/libcef/browser/url_request_context_getter.h
index 1bffe4568..4aeb604b3 100644
--- a/cef3/libcef/browser/url_request_context_getter.h
+++ b/cef3/libcef/browser/url_request_context_getter.h
@@ -28,6 +28,7 @@ class URLRequestJobFactory;
 class URLSecurityManager;
 }
 
+/*
 // Classes used in network request processing:
 //
 // RC = net::URLRequestContext
@@ -66,6 +67,7 @@ class URLSecurityManager;
 // CefBrowserHostImpl -ref-> RCGP----/           /
 //             ^                                /
 //              \-ref--------------------------/
+*/
 
 class CefURLRequestContextGetter : public net::URLRequestContextGetter {
  public: