summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base__process__memory_unittest.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-05-20 20:47:17 +0000
committerRene Ladan <rene@FreeBSD.org>2014-05-20 20:47:17 +0000
commitc62329ccbd97e5190ad152e9428810f0e5c1d943 (patch)
tree2dd8ccc48e698b7993db731cd111168b9f3e16d7 /www/chromium/files/patch-base__process__memory_unittest.cc
parentDocument new vulnerabilities in www/chromium < 35.0.1916.114 (diff)
Update to 35.0.1916.114
Changes include: - More developer control over touch input - New JavaScript features - Unprefixed Shadow DOM - A number of new apps/extension APIs - Lots of under the hood changes for stability and performance MFH: 2014Q2 Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-base__process__memory_unittest.cc')
-rw-r--r--www/chromium/files/patch-base__process__memory_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc
index 67821949cc81..0525487568ee 100644
--- a/www/chromium/files/patch-base__process__memory_unittest.cc
+++ b/www/chromium/files/patch-base__process__memory_unittest.cc
@@ -1,5 +1,5 @@
---- ./base/process/memory_unittest.cc.orig 2014-04-24 22:36:10.000000000 +0200
-+++ ./base/process/memory_unittest.cc 2014-04-24 23:23:41.000000000 +0200
+--- ./base/process/memory_unittest.cc.orig 2014-04-30 22:41:43.000000000 +0200
++++ ./base/process/memory_unittest.cc 2014-05-04 16:09:01.000000000 +0200
@@ -151,12 +151,12 @@
// Android doesn't implement set_new_handler, so we can't use the
@@ -15,9 +15,9 @@
!defined(OS_WIN) && \
!defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
-@@ -372,5 +372,5 @@
- #endif // !ARCH_CPU_64_BITS
- #endif // OS_MACOSX
+@@ -427,5 +427,5 @@
+ EXPECT_TRUE(value_ == NULL);
+ }
-#endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&
+#endif // !defined(OS_ANDROID) && !defined(OS_BSD) &&