Update to Chromium revision 2b3ae3b8 (#394939)

This commit is contained in:
Marshall Greenblatt
2016-05-24 19:35:43 -04:00
parent 582ce074aa
commit ab2636b012
125 changed files with 619 additions and 626 deletions

View File

@@ -1,8 +1,8 @@
diff --git stream_context.cc stream_context.cc
index e338396..150cde5 100644
index 3782205..5d97643 100644
--- stream_context.cc
+++ stream_context.cc
@@ -19,6 +19,10 @@ namespace content {
@@ -21,6 +21,10 @@ namespace content {
StreamContext::StreamContext() {}
@@ -14,10 +14,10 @@ index e338396..150cde5 100644
if (!context->GetUserData(kStreamContextKeyName)) {
scoped_refptr<StreamContext> stream = new StreamContext();
diff --git stream_context.h stream_context.h
index ad8f65c..60310db 100644
index 075ae3e..57fb5fd 100644
--- stream_context.h
+++ stream_context.h
@@ -28,6 +28,7 @@ class StreamContext
@@ -29,6 +29,7 @@ class StreamContext
public:
StreamContext();