96 files changed, 41 insertions, 48 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 94c7a86..864a46f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -850,7 +850,7 @@ component("base") {
     all_dependent_configs = [ ":base_win_linker_flags" ]
   } else if (!is_nacl || is_nacl_nonsfi) {
     # Non-Windows.
-    deps += [ "//third_party/libevent" ]
+    deps += [ "//base/third_party/libevent" ]
   }
 
   # Mac.
@@ -1580,7 +1580,7 @@ test("base_unittests") {
 
   if (is_posix && !is_ios) {
     sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
-    deps += [ "//third_party/libevent" ]
+    deps += [ "//base/third_party/libevent" ]
   }
 
   if (is_android) {
diff --git a/base/DEPS b/base/DEPS
index f91b3ce..c0e95a0 100644
--- a/base/DEPS
+++ b/base/DEPS
@@ -2,7 +2,6 @@ include_rules = [
   "+jni",
   "+third_party/ashmem",
   "+third_party/apple_apsl",
-  "+third_party/libevent",
   "+third_party/lss",
   "+third_party/modp_b64",
   "+third_party/tcmalloc",
diff --git a/base/base.gyp b/base/base.gyp
index 7e42ac8..7408d05 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -207,7 +207,7 @@
           },
         }],
         ['OS != "win" and (OS != "ios" or _toolset == "host")', {
-            'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
+            'dependencies': ['third_party/libevent/libevent.gyp:libevent'],
         },],
         ['component=="shared_library"', {
           'conditions': [
@@ -809,7 +809,7 @@
           ],
         }, {  # OS != "win"
           'dependencies': [
-            '../third_party/libevent/libevent.gyp:libevent'
+            'third_party/libevent/libevent.gyp:libevent'
           ],
         }],
       ],  # conditions
diff --git a/base/base_nacl.gyp b/base/base_nacl.gyp
index 7010256..675cbd6 100644
--- a/base/base_nacl.gyp
+++ b/base/base_nacl.gyp
@@ -117,8 +117,8 @@
             'rand_util_nacl.cc',
           ],
           'dependencies': [
-            '../third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi',
             'base.gyp:base_debugging_flags',
+            'third_party/libevent/libevent_nacl_nonsfi.gyp:event_nacl_nonsfi',
           ],
         },
         {
diff --git a/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc
index 04a1cb9..2923f5c 100644
--- a/base/message_loop/message_pump_libevent.cc
+++ b/base/message_loop/message_pump_libevent.cc
@@ -14,9 +14,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/third_party/libevent/event.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
-#include "third_party/libevent/event.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
diff --git a/base/message_loop/message_pump_libevent_unittest.cc b/base/message_loop/message_pump_libevent_unittest.cc
index e911905..89393d1 100644
--- a/base/message_loop/message_pump_libevent_unittest.cc
+++ b/base/message_loop/message_pump_libevent_unittest.cc
@@ -15,9 +15,9 @@
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/synchronization/waitable_event_watcher.h"
+#include "base/third_party/libevent/event.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libevent/event.h"
 
 namespace base {
 
diff --git a/third_party/libevent/BUILD.gn b/base/third_party/libevent/BUILD.gn
index 61be1d7..61be1d7 100644
--- a/third_party/libevent/BUILD.gn
+++ b/base/third_party/libevent/BUILD.gn
diff --git a/third_party/libevent/ChangeLog b/base/third_party/libevent/ChangeLog
index 893b0873..893b0873 100644
--- a/third_party/libevent/ChangeLog
+++ b/base/third_party/libevent/ChangeLog
diff --git a/third_party/libevent/Doxyfile b/base/third_party/libevent/Doxyfile
index 77f6de8..77f6de8 100644
--- a/third_party/libevent/Doxyfile
+++ b/base/third_party/libevent/Doxyfile
diff --git a/third_party/libevent/LICENSE b/base/third_party/libevent/LICENSE
index cabd9fc..cabd9fc 100644
--- a/third_party/libevent/LICENSE
+++ b/base/third_party/libevent/LICENSE
diff --git a/third_party/libevent/Makefile.am b/base/third_party/libevent/Makefile.am
index c1ed62a..c1ed62a 100644
--- a/third_party/libevent/Makefile.am
+++ b/base/third_party/libevent/Makefile.am
diff --git a/third_party/libevent/Makefile.nmake b/base/third_party/libevent/Makefile.nmake
index f8d5722..f8d5722 100644
--- a/third_party/libevent/Makefile.nmake
+++ b/base/third_party/libevent/Makefile.nmake
diff --git a/third_party/libevent/README b/base/third_party/libevent/README
index b065039..b065039 100644
--- a/third_party/libevent/README
+++ b/base/third_party/libevent/README
diff --git a/third_party/libevent/README.chromium b/base/third_party/libevent/README.chromium
index d8bb4de..d8bb4de 100644
--- a/third_party/libevent/README.chromium
+++ b/base/third_party/libevent/README.chromium
diff --git a/third_party/libevent/android/config.h b/base/third_party/libevent/android/config.h
index 91f4dda..91f4dda 100644
--- a/third_party/libevent/android/config.h
+++ b/base/third_party/libevent/android/config.h
diff --git a/third_party/libevent/android/event-config.h b/base/third_party/libevent/android/event-config.h
index 6563cb7..6563cb7 100644
--- a/third_party/libevent/android/event-config.h
+++ b/base/third_party/libevent/android/event-config.h
diff --git a/third_party/libevent/autogen.sh b/base/third_party/libevent/autogen.sh
index 099cb30..099cb30 100755
--- a/third_party/libevent/autogen.sh
+++ b/base/third_party/libevent/autogen.sh
diff --git a/third_party/libevent/buffer.c b/base/third_party/libevent/buffer.c
index ebf35c9..ebf35c9 100644
--- a/third_party/libevent/buffer.c
+++ b/base/third_party/libevent/buffer.c
diff --git a/third_party/libevent/chromium.patch b/base/third_party/libevent/chromium.patch
index f6e00e8..f6e00e8 100644
--- a/third_party/libevent/chromium.patch
+++ b/base/third_party/libevent/chromium.patch
diff --git a/third_party/libevent/compat/sys/_libevent_time.h b/base/third_party/libevent/compat/sys/_libevent_time.h
index 8cabb0d..8cabb0d 100644
--- a/third_party/libevent/compat/sys/_libevent_time.h
+++ b/base/third_party/libevent/compat/sys/_libevent_time.h
diff --git a/third_party/libevent/compat/sys/queue.h b/base/third_party/libevent/compat/sys/queue.h
index c0956dd..c0956dd 100644
--- a/third_party/libevent/compat/sys/queue.h
+++ b/base/third_party/libevent/compat/sys/queue.h
diff --git a/third_party/libevent/configure.in b/base/third_party/libevent/configure.in
index 468d774..468d774 100644
--- a/third_party/libevent/configure.in
+++ b/base/third_party/libevent/configure.in
diff --git a/third_party/libevent/devpoll.c b/base/third_party/libevent/devpoll.c
index 2d34ae3..2d34ae3 100644
--- a/third_party/libevent/devpoll.c
+++ b/base/third_party/libevent/devpoll.c
diff --git a/third_party/libevent/epoll.c b/base/third_party/libevent/epoll.c
index 4387ef8..4387ef8 100644
--- a/third_party/libevent/epoll.c
+++ b/base/third_party/libevent/epoll.c
diff --git a/third_party/libevent/epoll_sub.c b/base/third_party/libevent/epoll_sub.c
index 431970c..431970c 100644
--- a/third_party/libevent/epoll_sub.c
+++ b/base/third_party/libevent/epoll_sub.c
diff --git a/third_party/libevent/evbuffer.c b/base/third_party/libevent/evbuffer.c
index f2179a5..f2179a5 100644
--- a/third_party/libevent/evbuffer.c
+++ b/base/third_party/libevent/evbuffer.c
diff --git a/third_party/libevent/evdns.3 b/base/third_party/libevent/evdns.3
index 10414fa..10414fa 100644
--- a/third_party/libevent/evdns.3
+++ b/base/third_party/libevent/evdns.3
diff --git a/third_party/libevent/evdns.c b/base/third_party/libevent/evdns.c
index 05fe594..05fe594 100644
--- a/third_party/libevent/evdns.c
+++ b/base/third_party/libevent/evdns.c
diff --git a/third_party/libevent/evdns.h b/base/third_party/libevent/evdns.h
index fca4ac3..fca4ac3 100644
--- a/third_party/libevent/evdns.h
+++ b/base/third_party/libevent/evdns.h
diff --git a/third_party/libevent/event-config.h b/base/third_party/libevent/event-config.h
index c5c0e75..3b1eaa0 100644
--- a/third_party/libevent/event-config.h
+++ b/base/third_party/libevent/event-config.h
@@ -6,17 +6,17 @@
 // event-config.h depending on your platform.
 
 #if defined(__native_client_nonsfi__)
-#include "third_party/libevent/nacl_nonsfi/event-config.h"
+#include "base/third_party/libevent/nacl_nonsfi/event-config.h"
 #elif defined(__APPLE__)
-#include "third_party/libevent/mac/event-config.h"
+#include "base/third_party/libevent/mac/event-config.h"
 #elif defined(ANDROID)
-#include "third_party/libevent/android/event-config.h"
+#include "base/third_party/libevent/android/event-config.h"
 #elif defined(__linux__)
-#include "third_party/libevent/linux/event-config.h"
+#include "base/third_party/libevent/linux/event-config.h"
 #elif defined(__FreeBSD__)
-#include "third_party/libevent/freebsd/event-config.h"
+#include "base/third_party/libevent/freebsd/event-config.h"
 #elif defined(__sun)
-#include "third_party/libevent/solaris/event-config.h"
+#include "base/third_party/libevent/solaris/event-config.h"
 #else
 #error generate event-config.h for your platform
 #endif
diff --git a/third_party/libevent/event-internal.h b/base/third_party/libevent/event-internal.h
index b7f0040..b7f0040 100644
--- a/third_party/libevent/event-internal.h
+++ b/base/third_party/libevent/event-internal.h
diff --git a/third_party/libevent/event.3 b/base/third_party/libevent/event.3
index 5b33ec6..5b33ec6 100644
--- a/third_party/libevent/event.3
+++ b/base/third_party/libevent/event.3
diff --git a/third_party/libevent/event.c b/base/third_party/libevent/event.c
index 36b1c51..36b1c51 100644
--- a/third_party/libevent/event.c
+++ b/base/third_party/libevent/event.c
diff --git a/third_party/libevent/event.h b/base/third_party/libevent/event.h
index f0887b9..f0887b9 100644
--- a/third_party/libevent/event.h
+++ b/base/third_party/libevent/event.h
diff --git a/third_party/libevent/event_rpcgen.py b/base/third_party/libevent/event_rpcgen.py
index 4ec77a6..4ec77a6 100755
--- a/third_party/libevent/event_rpcgen.py
+++ b/base/third_party/libevent/event_rpcgen.py
diff --git a/third_party/libevent/event_tagging.c b/base/third_party/libevent/event_tagging.c
index d436e3f..d436e3f 100644
--- a/third_party/libevent/event_tagging.c
+++ b/base/third_party/libevent/event_tagging.c
diff --git a/third_party/libevent/evhttp.h b/base/third_party/libevent/evhttp.h
index 48c1d91..48c1d91 100644
--- a/third_party/libevent/evhttp.h
+++ b/base/third_party/libevent/evhttp.h
diff --git a/third_party/libevent/evport.c b/base/third_party/libevent/evport.c
index 1f5ebc4..1f5ebc4 100644
--- a/third_party/libevent/evport.c
+++ b/base/third_party/libevent/evport.c
diff --git a/third_party/libevent/evrpc-internal.h b/base/third_party/libevent/evrpc-internal.h
index c900f95..c900f95 100644
--- a/third_party/libevent/evrpc-internal.h
+++ b/base/third_party/libevent/evrpc-internal.h
diff --git a/third_party/libevent/evrpc.c b/base/third_party/libevent/evrpc.c
index 070fd9e7..070fd9e7 100644
--- a/third_party/libevent/evrpc.c
+++ b/base/third_party/libevent/evrpc.c
diff --git a/third_party/libevent/evrpc.h b/base/third_party/libevent/evrpc.h
index 7c16b95..7c16b95 100644
--- a/third_party/libevent/evrpc.h
+++ b/base/third_party/libevent/evrpc.h
diff --git a/third_party/libevent/evsignal.h b/base/third_party/libevent/evsignal.h
index 076cd8d..076cd8d 100644
--- a/third_party/libevent/evsignal.h
+++ b/base/third_party/libevent/evsignal.h
diff --git a/third_party/libevent/evutil.c b/base/third_party/libevent/evutil.c
index cc6d0f4..cc6d0f4 100644
--- a/third_party/libevent/evutil.c
+++ b/base/third_party/libevent/evutil.c
diff --git a/third_party/libevent/evutil.h b/base/third_party/libevent/evutil.h
index 8b664b9..8b664b9 100644
--- a/third_party/libevent/evutil.h
+++ b/base/third_party/libevent/evutil.h
diff --git a/third_party/libevent/freebsd/config.h b/base/third_party/libevent/freebsd/config.h
index 4fe3d6b..4fe3d6b 100644
--- a/third_party/libevent/freebsd/config.h
+++ b/base/third_party/libevent/freebsd/config.h
diff --git a/third_party/libevent/freebsd/event-config.h b/base/third_party/libevent/freebsd/event-config.h
index be1eae4..be1eae4 100644
--- a/third_party/libevent/freebsd/event-config.h
+++ b/base/third_party/libevent/freebsd/event-config.h
diff --git a/third_party/libevent/http-internal.h b/base/third_party/libevent/http-internal.h
index 9cd03cd..9cd03cd 100644
--- a/third_party/libevent/http-internal.h
+++ b/base/third_party/libevent/http-internal.h
diff --git a/third_party/libevent/http.c b/base/third_party/libevent/http.c
index 4abce23..4abce23 100644
--- a/third_party/libevent/http.c
+++ b/base/third_party/libevent/http.c
diff --git a/third_party/libevent/kqueue.c b/base/third_party/libevent/kqueue.c
index ee740ee..ee740ee 100644
--- a/third_party/libevent/kqueue.c
+++ b/base/third_party/libevent/kqueue.c
diff --git a/third_party/libevent/libevent.gyp b/base/third_party/libevent/libevent.gyp
index 656dd63..581aa89 100644
--- a/third_party/libevent/libevent.gyp
+++ b/base/third_party/libevent/libevent.gyp
@@ -28,7 +28,7 @@
         'HAVE_CONFIG_H',
       ],
       'include_dirs': [
-        '../..',
+        '../../..',
       ],
       'conditions': [
         # libevent has platform-specific implementation files.  Since its
diff --git a/third_party/libevent/libevent_nacl_nonsfi.gyp b/base/third_party/libevent/libevent_nacl_nonsfi.gyp
index 2999ceb..91e2557 100644
--- a/third_party/libevent/libevent_nacl_nonsfi.gyp
+++ b/base/third_party/libevent/libevent_nacl_nonsfi.gyp
@@ -4,7 +4,7 @@
 
 {
   'includes': [
-    '../../build/common_untrusted.gypi',
+    '../../../build/common_untrusted.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
diff --git a/third_party/libevent/linux/config.h b/base/third_party/libevent/linux/config.h
index c01ceb5..c01ceb5 100644
--- a/third_party/libevent/linux/config.h
+++ b/base/third_party/libevent/linux/config.h
diff --git a/third_party/libevent/linux/event-config.h b/base/third_party/libevent/linux/event-config.h
index 2203253..2203253 100644
--- a/third_party/libevent/linux/event-config.h
+++ b/base/third_party/libevent/linux/event-config.h
diff --git a/third_party/libevent/log.c b/base/third_party/libevent/log.c
index 48ebb26..48ebb26 100644
--- a/third_party/libevent/log.c
+++ b/base/third_party/libevent/log.c
diff --git a/third_party/libevent/log.h b/base/third_party/libevent/log.h
index 7bc6632..7bc6632 100644
--- a/third_party/libevent/log.h
+++ b/base/third_party/libevent/log.h
diff --git a/third_party/libevent/m4/.dummy b/base/third_party/libevent/m4/.dummy
index a0a72d6..a0a72d6 100644
--- a/third_party/libevent/m4/.dummy
+++ b/base/third_party/libevent/m4/.dummy
diff --git a/third_party/libevent/mac/config.h b/base/third_party/libevent/mac/config.h
index f73f0c6..f73f0c6 100644
--- a/third_party/libevent/mac/config.h
+++ b/base/third_party/libevent/mac/config.h
diff --git a/third_party/libevent/mac/event-config.h b/base/third_party/libevent/mac/event-config.h
index 92e212d..92e212d 100644
--- a/third_party/libevent/mac/event-config.h
+++ b/base/third_party/libevent/mac/event-config.h
diff --git a/third_party/libevent/min_heap.h b/base/third_party/libevent/min_heap.h
index 14d8e37..14d8e37 100644
--- a/third_party/libevent/min_heap.h
+++ b/base/third_party/libevent/min_heap.h
diff --git a/third_party/libevent/nacl_nonsfi/config.h b/base/third_party/libevent/nacl_nonsfi/config.h
index 60c9dfe..60c9dfe 100644
--- a/third_party/libevent/nacl_nonsfi/config.h
+++ b/base/third_party/libevent/nacl_nonsfi/config.h
diff --git a/third_party/libevent/nacl_nonsfi/event-config.h b/base/third_party/libevent/nacl_nonsfi/event-config.h
index fe28043..fe28043 100644
--- a/third_party/libevent/nacl_nonsfi/event-config.h
+++ b/base/third_party/libevent/nacl_nonsfi/event-config.h
diff --git a/third_party/libevent/nacl_nonsfi/random.c b/base/third_party/libevent/nacl_nonsfi/random.c
index 3577dd5..3577dd5 100644
--- a/third_party/libevent/nacl_nonsfi/random.c
+++ b/base/third_party/libevent/nacl_nonsfi/random.c
diff --git a/third_party/libevent/nacl_nonsfi/signal_stub.c b/base/third_party/libevent/nacl_nonsfi/signal_stub.c
index 8049030..0399e8c 100644
--- a/third_party/libevent/nacl_nonsfi/signal_stub.c
+++ b/base/third_party/libevent/nacl_nonsfi/signal_stub.c
@@ -19,9 +19,9 @@
 /* config.h must be included before any other libevent header is included. */
 #include "config.h"
 
-#include "third_party/libevent/event-internal.h"
-#include "third_party/libevent/event.h"
-#include "third_party/libevent/evsignal.h"
+#include "base/third_party/libevent/event-internal.h"
+#include "base/third_party/libevent/event.h"
+#include "base/third_party/libevent/evsignal.h"
 
 
 struct event_base *evsignal_base = 0;
diff --git a/third_party/libevent/poll.c b/base/third_party/libevent/poll.c
index 2aa245b..2aa245b 100644
--- a/third_party/libevent/poll.c
+++ b/base/third_party/libevent/poll.c
diff --git a/third_party/libevent/sample/Makefile.am b/base/third_party/libevent/sample/Makefile.am
index 2f4e26e..2f4e26e 100644
--- a/third_party/libevent/sample/Makefile.am
+++ b/base/third_party/libevent/sample/Makefile.am
diff --git a/third_party/libevent/sample/event-test.c b/base/third_party/libevent/sample/event-test.c
index 0a439ce..0a439ce 100644
--- a/third_party/libevent/sample/event-test.c
+++ b/base/third_party/libevent/sample/event-test.c
diff --git a/third_party/libevent/sample/signal-test.c b/base/third_party/libevent/sample/signal-test.c
index 5a5a303..5a5a303 100644
--- a/third_party/libevent/sample/signal-test.c
+++ b/base/third_party/libevent/sample/signal-test.c
diff --git a/third_party/libevent/sample/time-test.c b/base/third_party/libevent/sample/time-test.c
index 069d4f8..069d4f8 100644
--- a/third_party/libevent/sample/time-test.c
+++ b/base/third_party/libevent/sample/time-test.c
diff --git a/third_party/libevent/select.c b/base/third_party/libevent/select.c
index 3f73331..3f73331 100644
--- a/third_party/libevent/select.c
+++ b/base/third_party/libevent/select.c
diff --git a/third_party/libevent/signal.c b/base/third_party/libevent/signal.c
index b8d51ab..b8d51ab 100644
--- a/third_party/libevent/signal.c
+++ b/base/third_party/libevent/signal.c
diff --git a/third_party/libevent/solaris/config.h b/base/third_party/libevent/solaris/config.h
index 4dd40eb..4dd40eb 100644
--- a/third_party/libevent/solaris/config.h
+++ b/base/third_party/libevent/solaris/config.h
diff --git a/third_party/libevent/solaris/event-config.h b/base/third_party/libevent/solaris/event-config.h
index afabe2f..afabe2f 100644
--- a/third_party/libevent/solaris/event-config.h
+++ b/base/third_party/libevent/solaris/event-config.h
diff --git a/third_party/libevent/stamp-h.in b/base/third_party/libevent/stamp-h.in
index 9788f70..9788f70 100644
--- a/third_party/libevent/stamp-h.in
+++ b/base/third_party/libevent/stamp-h.in
diff --git a/third_party/libevent/strlcpy-internal.h b/base/third_party/libevent/strlcpy-internal.h
index 22b5f61..22b5f61 100644
--- a/third_party/libevent/strlcpy-internal.h
+++ b/base/third_party/libevent/strlcpy-internal.h
diff --git a/third_party/libevent/strlcpy.c b/base/third_party/libevent/strlcpy.c
index 5d19452..5d19452 100644
--- a/third_party/libevent/strlcpy.c
+++ b/base/third_party/libevent/strlcpy.c
diff --git a/third_party/libevent/test/Makefile.am b/base/third_party/libevent/test/Makefile.am
index 3558d02..3558d02 100644
--- a/third_party/libevent/test/Makefile.am
+++ b/base/third_party/libevent/test/Makefile.am
diff --git a/third_party/libevent/test/Makefile.nmake b/base/third_party/libevent/test/Makefile.nmake
index 320abe7..320abe7 100644
--- a/third_party/libevent/test/Makefile.nmake
+++ b/base/third_party/libevent/test/Makefile.nmake
diff --git a/third_party/libevent/test/bench.c b/base/third_party/libevent/test/bench.c
index c976932..c976932 100644
--- a/third_party/libevent/test/bench.c
+++ b/base/third_party/libevent/test/bench.c
diff --git a/third_party/libevent/test/regress.c b/base/third_party/libevent/test/regress.c
index cce7d7d..cce7d7d 100644
--- a/third_party/libevent/test/regress.c
+++ b/base/third_party/libevent/test/regress.c
diff --git a/third_party/libevent/test/regress.h b/base/third_party/libevent/test/regress.h
index 4060ff5..4060ff5 100644
--- a/third_party/libevent/test/regress.h
+++ b/base/third_party/libevent/test/regress.h
diff --git a/third_party/libevent/test/regress.rpc b/base/third_party/libevent/test/regress.rpc
index 65ca95d..65ca95d 100644
--- a/third_party/libevent/test/regress.rpc
+++ b/base/third_party/libevent/test/regress.rpc
diff --git a/third_party/libevent/test/regress_dns.c b/base/third_party/libevent/test/regress_dns.c
index 129cdad..129cdad 100644
--- a/third_party/libevent/test/regress_dns.c
+++ b/base/third_party/libevent/test/regress_dns.c
diff --git a/third_party/libevent/test/regress_http.c b/base/third_party/libevent/test/regress_http.c
index 943b29d..943b29d 100644
--- a/third_party/libevent/test/regress_http.c
+++ b/base/third_party/libevent/test/regress_http.c
diff --git a/third_party/libevent/test/regress_rpc.c b/base/third_party/libevent/test/regress_rpc.c
index 7609347..7609347 100644
--- a/third_party/libevent/test/regress_rpc.c
+++ b/base/third_party/libevent/test/regress_rpc.c
diff --git a/third_party/libevent/test/test-eof.c b/base/third_party/libevent/test/test-eof.c
index 3264a7b..3264a7b 100644
--- a/third_party/libevent/test/test-eof.c
+++ b/base/third_party/libevent/test/test-eof.c
diff --git a/third_party/libevent/test/test-init.c b/base/third_party/libevent/test/test-init.c
index d60aa36..d60aa36 100644
--- a/third_party/libevent/test/test-init.c
+++ b/base/third_party/libevent/test/test-init.c
diff --git a/third_party/libevent/test/test-time.c b/base/third_party/libevent/test/test-time.c
index 703bc32..703bc32 100644
--- a/third_party/libevent/test/test-time.c
+++ b/base/third_party/libevent/test/test-time.c
diff --git a/third_party/libevent/test/test-weof.c b/base/third_party/libevent/test/test-weof.c
index 7fd6c8b..7fd6c8b 100644
--- a/third_party/libevent/test/test-weof.c
+++ b/base/third_party/libevent/test/test-weof.c
diff --git a/third_party/libevent/test/test.sh b/base/third_party/libevent/test/test.sh
index 506a198..506a198 100755
--- a/third_party/libevent/test/test.sh
+++ b/base/third_party/libevent/test/test.sh
diff --git a/third_party/libevent/whatsnew-14.txt b/base/third_party/libevent/whatsnew-14.txt
index 769dda78..769dda78 100644
--- a/third_party/libevent/whatsnew-14.txt
+++ b/base/third_party/libevent/whatsnew-14.txt
diff --git a/build/all.gyp b/build/all.gyp
index de8ad1f..37929b5 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -235,10 +235,6 @@
             '../third_party/bspatch/bspatch.gyp:*',
             '../tools/win/static_initializers/static_initializers.gyp:*',
           ],
-        }, {
-          'dependencies': [
-            '../third_party/libevent/libevent.gyp:*',
-          ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
diff --git a/build/linux/unbundle/libevent.gyp b/build/linux/unbundle/libevent.gyp
index 99d7435..d6171f9 100644
--- a/build/linux/unbundle/libevent.gyp
+++ b/build/linux/unbundle/libevent.gyp
@@ -15,7 +15,7 @@
         ],
       },
       'includes': [
-        '../../build/shim_headers.gypi',
+        '../../../build/shim_headers.gypi',
       ],
       'link_settings': {
         'libraries': [
diff --git a/build/linux/unbundle/replace_gyp_files.py b/build/linux/unbundle/replace_gyp_files.py
index 13f7ba9..1f3b86a 100755
--- a/build/linux/unbundle/replace_gyp_files.py
+++ b/build/linux/unbundle/replace_gyp_files.py
@@ -22,7 +22,7 @@ REPLACEMENTS = {
   'use_system_harfbuzz': 'third_party/harfbuzz-ng/harfbuzz.gyp',
   'use_system_icu': 'third_party/icu/icu.gyp',
   'use_system_jsoncpp': 'third_party/jsoncpp/jsoncpp.gyp',
-  'use_system_libevent': 'third_party/libevent/libevent.gyp',
+  'use_system_libevent': 'base/third_party/libevent/libevent.gyp',
   'use_system_libjpeg': 'third_party/libjpeg/libjpeg.gyp',
   'use_system_libpng': 'third_party/libpng/libpng.gyp',
   'use_system_libusb': 'third_party/libusb/libusb.gyp',
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 8efc2cb..cda9b46 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -108,6 +108,10 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
         'UNKNOWN',
     ],
 
+    'base/third_party/libevent': [  # http://crbug.com/98309
+        'UNKNOWN',
+    ],
+
     # http://code.google.com/p/google-breakpad/issues/detail?id=450
     'breakpad/src': [
         'UNKNOWN',
@@ -409,9 +413,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'third_party/lcov/contrib/galaxy/genflat.pl': [
         'GPL (v2 or later)',
     ],
-    'third_party/libevent': [  # http://crbug.com/98309
-        'UNKNOWN',
-    ],
     'third_party/libjingle/source/talk': [  # http://crbug.com/98310
         'UNKNOWN',
     ],
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 38003e3..cd72fe7 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -310,19 +310,19 @@ def write_ninja(path, options):
     ])
     static_libraries['libevent'] = {
         'sources': [
-            'third_party/libevent/buffer.c',
-            'third_party/libevent/evbuffer.c',
-            'third_party/libevent/evdns.c',
-            'third_party/libevent/event.c',
-            'third_party/libevent/event_tagging.c',
-            'third_party/libevent/evrpc.c',
-            'third_party/libevent/evutil.c',
-            'third_party/libevent/http.c',
-            'third_party/libevent/log.c',
-            'third_party/libevent/poll.c',
-            'third_party/libevent/select.c',
-            'third_party/libevent/signal.c',
-            'third_party/libevent/strlcpy.c',
+            'base/third_party/libevent/buffer.c',
+            'base/third_party/libevent/evbuffer.c',
+            'base/third_party/libevent/evdns.c',
+            'base/third_party/libevent/event.c',
+            'base/third_party/libevent/event_tagging.c',
+            'base/third_party/libevent/evrpc.c',
+            'base/third_party/libevent/evutil.c',
+            'base/third_party/libevent/http.c',
+            'base/third_party/libevent/log.c',
+            'base/third_party/libevent/poll.c',
+            'base/third_party/libevent/select.c',
+            'base/third_party/libevent/signal.c',
+            'base/third_party/libevent/strlcpy.c',
         ],
         'tool': 'cc',
         'include_dirs': [],
@@ -354,10 +354,10 @@ def write_ninja(path, options):
         'base/trace_event/process_memory_maps_dump_provider.cc',
     ])
     static_libraries['libevent']['include_dirs'].extend([
-        os.path.join(SRC_ROOT, 'third_party', 'libevent', 'linux')
+        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
     ])
     static_libraries['libevent']['sources'].extend([
-        'third_party/libevent/epoll.c',
+        'base/third_party/libevent/epoll.c',
     ])
 
 
@@ -382,10 +382,10 @@ def write_ninja(path, options):
         'base/trace_event/malloc_dump_provider.cc',
     ])
     static_libraries['libevent']['include_dirs'].extend([
-        os.path.join(SRC_ROOT, 'third_party', 'libevent', 'mac')
+        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')
     ])
     static_libraries['libevent']['sources'].extend([
-        'third_party/libevent/kqueue.c',
+        'base/third_party/libevent/kqueue.c',
     ])
 
 
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index ce08fd0..3bbe49d 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -159,9 +159,6 @@ component("gl") {
       "gl_implementation_osmesa.h",
     ]
   }
-  if (is_linux) {
-    deps += [ "//third_party/libevent" ]
-  }
   if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
     deps += [ "//third_party/mesa:osmesa" ]
   }