From 2582e8561ce76541a90bc4f01b1e67bdf8dfcb96 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Thu, 30 May 2013 15:04:51 -0400
Subject: [PATCH] Update to Chromium r202921

* vendor/libchromiumcontent 0d02a8d...2f53a96 (1):
  > Merge pull request #14 from brightray/latest-chromium
---
 brightray/brightray.gypi                        | 1 +
 brightray/browser/url_request_context_getter.cc | 1 +
 brightray/common/content_client.cc              | 2 +-
 brightray/vendor/libchromiumcontent             | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/brightray/brightray.gypi b/brightray/brightray.gypi
index 964eae9de5..69513546df 100644
--- a/brightray/brightray.gypi
+++ b/brightray/brightray.gypi
@@ -207,6 +207,7 @@
           4245, # 'initializing' : conversion from 'int' to 'const net::QuicVersionTag', signed/unsigned mismatch
           4251, # class 'std::xx' needs to have dll-interface.
           4310, # cast truncates constant value
+          4355, # 'this' : used in base member initializer list
           4480, # nonstandard extension used: specifying underlying type for enum
           4481, # nonstandard extension used: override specifier 'override'
           4512, # assignment operator could not be generated
diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc
index 5726500f6c..7c5c45111b 100644
--- a/brightray/browser/url_request_context_getter.cc
+++ b/brightray/browser/url_request_context_getter.cc
@@ -90,6 +90,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext()
     net::HttpCache::DefaultBackend* main_backend =
         new net::HttpCache::DefaultBackend(
             net::DISK_CACHE,
+            net::CACHE_BACKEND_DEFAULT,
             cache_path,
             0,
             content::BrowserThread::GetMessageLoopProxyForThread(
diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc
index 87cc07abfe..fc294f45ec 100644
--- a/brightray/common/content_client.cc
+++ b/brightray/common/content_client.cc
@@ -9,7 +9,7 @@
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/user_agent/user_agent_util.h"
+#include "webkit/common/user_agent/user_agent_util.h"
 
 namespace brightray {
 
diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent
index 0d02a8d41a..2f53a96fc6 160000
--- a/brightray/vendor/libchromiumcontent
+++ b/brightray/vendor/libchromiumcontent
@@ -1 +1 @@
-Subproject commit 0d02a8d41a1d6711f196a744126fa5e2eba961ff
+Subproject commit 2f53a96fc665176d7e07b67bac6d861295587ce8