diff --git a/talk/app/webrtc/videosource.cc b/talk/app/webrtc/videosource.cc
index bb27b10bcd..4551e5ed60 100644
--- a/talk/app/webrtc/videosource.cc
+++ b/talk/app/webrtc/videosource.cc
@@ -318,8 +318,6 @@ class FrameInputWrapper : public cricket::VideoRenderer {
 
  private:
   cricket::VideoCapturer* capturer_;
-  int width_;
-  int height_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper);
 };
diff --git a/webrtc/base/constructormagic.h b/webrtc/base/constructormagic.h
index 6b1244fc64..6971580507 100644
--- a/webrtc/base/constructormagic.h
+++ b/webrtc/base/constructormagic.h
@@ -14,27 +14,27 @@
 // Undefine macros first, just in case. Some third-party includes have their own
 // version.
 
+// Put this in the declarations for a class to be unassignable.
 #undef DISALLOW_ASSIGN
 #define DISALLOW_ASSIGN(TypeName) \
-  void operator=(const TypeName&)
+  void operator=(const TypeName&) = delete
 
-// A macro to disallow the evil copy constructor and operator= functions
-// This should be used in the private: declarations for a class.
+// A macro to disallow the copy constructor and operator= functions. This should
+// be used in the declarations for a class.
 #undef DISALLOW_COPY_AND_ASSIGN
-#define DISALLOW_COPY_AND_ASSIGN(TypeName)    \
-  TypeName(const TypeName&);                    \
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&) = delete;      \
   DISALLOW_ASSIGN(TypeName)
 
-// A macro to disallow all the implicit constructors, namely the
-// default constructor, copy constructor and operator= functions.
+// A macro to disallow all the implicit constructors, namely the default
+// constructor, copy constructor and operator= functions.
 //
-// This should be used in the private: declarations for a class
-// that wants to prevent anyone from instantiating it. This is
-// especially useful for classes containing only static methods.
+// This should be used in the declarations for a class that wants to prevent
+// anyone from instantiating it. This is especially useful for classes
+// containing only static methods.
 #undef DISALLOW_IMPLICIT_CONSTRUCTORS
 #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName();                                    \
+  TypeName() = delete;                           \
   DISALLOW_COPY_AND_ASSIGN(TypeName)
 
-
 #endif  // WEBRTC_BASE_CONSTRUCTORMAGIC_H_
diff --git a/webrtc/base/logging.cc b/webrtc/base/logging.cc
index e2ee115063..e28b2e1047 100644
--- a/webrtc/base/logging.cc
+++ b/webrtc/base/logging.cc
@@ -195,8 +195,7 @@ LogMessage::~LogMessage() {
   }
   uint32 delay = TimeSince(before);
   if (delay >= warn_slow_logs_delay_) {
-    LogMessage slow_log_warning =
-        rtc::LogMessage(__FILE__, __LINE__, LS_WARNING);
+    rtc::LogMessage slow_log_warning(__FILE__, __LINE__, LS_WARNING);
     // If our warning is slow, we don't want to warn about it, because
     // that would lead to inifinite recursion.  So, give a really big
     // number for the delay threshold.
diff --git a/webrtc/base/natserver.h b/webrtc/base/natserver.h
index e987021773..9c883f9719 100644
--- a/webrtc/base/natserver.h
+++ b/webrtc/base/natserver.h
@@ -109,7 +109,6 @@ class NATServer : public sigslot::has_slots<> {
   bool ShouldFilterOut(TransEntry* entry, const SocketAddress& ext_addr);
 
   NAT* nat_;
-  SocketFactory* internal_;
   SocketFactory* external_;
   SocketAddress external_ip_;
   AsyncUDPSocket* udp_server_socket_;
diff --git a/webrtc/base/virtualsocketserver.cc b/webrtc/base/virtualsocketserver.cc
index c2f0e01dc0..a9ca98bf81 100644
--- a/webrtc/base/virtualsocketserver.cc
+++ b/webrtc/base/virtualsocketserver.cc
@@ -98,7 +98,6 @@ VirtualSocket::VirtualSocket(VirtualSocketServer* server,
                              int type,
                              bool async)
     : server_(server),
-      family_(family),
       type_(type),
       async_(async),
       state_(CS_CLOSED),
diff --git a/webrtc/base/virtualsocketserver.h b/webrtc/base/virtualsocketserver.h
index c708bb4a89..065d8437f8 100644
--- a/webrtc/base/virtualsocketserver.h
+++ b/webrtc/base/virtualsocketserver.h
@@ -306,7 +306,6 @@ class VirtualSocket : public AsyncSocket, public MessageHandler {
   void SetLocalAddress(const SocketAddress& addr);
 
   VirtualSocketServer* server_;
-  int family_;
   int type_;
   bool async_;
   ConnState state_;
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
index a84d6f0a5c..d958d6cbc6 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
@@ -719,8 +719,7 @@ VideoSource::VideoSource(int flow_id,
       next_frame_ms_(first_frame_offset_ms),
       next_frame_rand_ms_(0),
       now_ms_(0),
-      prototype_header_(),
-      start_plotting_ms_(first_frame_offset_ms) {
+      prototype_header_() {
   memset(&prototype_header_, 0, sizeof(prototype_header_));
   prototype_header_.ssrc = ssrc;
   prototype_header_.sequenceNumber = 0xf000u;
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
index ceaa6373ff..cf4a649d53 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
@@ -370,7 +370,6 @@ class ChokeFilter : public PacketProcessor {
   uint32_t capacity_kbps_;
   int64_t last_send_time_us_;
   rtc::scoped_ptr<DelayCapHelper> delay_cap_helper_;
-  int64_t max_delay_us_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter);
 };
@@ -447,8 +446,6 @@ class VideoSource {
   int64_t next_frame_rand_ms_;
   int64_t now_ms_;
   RTPHeader prototype_header_;
-  int64_t start_plotting_ms_;
-  uint32_t previous_bitrate_bps_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoSource);
 };
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
index d8063b03f1..aeef44364a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
@@ -153,8 +153,7 @@ RtpPacketizerH264::RtpPacketizerH264(FrameType frame_type,
                                      size_t max_payload_len)
     : payload_data_(NULL),
       payload_size_(0),
-      max_payload_len_(max_payload_len),
-      frame_type_(frame_type) {
+      max_payload_len_(max_payload_len) {
 }
 
 RtpPacketizerH264::~RtpPacketizerH264() {
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
index 4e92895c61..a6e1424be0 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
@@ -84,7 +84,6 @@ class RtpPacketizerH264 : public RtpPacketizer {
   const size_t max_payload_len_;
   RTPFragmentationHeader fragmentation_;
   PacketQueue packets_;
-  FrameType frame_type_;
 
   DISALLOW_COPY_AND_ASSIGN(RtpPacketizerH264);
 };
diff --git a/webrtc/modules/video_coding/main/test/test_util.h b/webrtc/modules/video_coding/main/test/test_util.h
index 11fb6d4dda..fd11db64fe 100644
--- a/webrtc/modules/video_coding/main/test/test_util.h
+++ b/webrtc/modules/video_coding/main/test/test_util.h
@@ -61,7 +61,6 @@ class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
 
  private:
   std::string out_filename_;
-  uint32_t ssrc_;
   FILE* out_file_;
   FILE* timing_file_;
   int width_;
diff --git a/webrtc/overrides/webrtc/base/constructormagic.h b/webrtc/overrides/webrtc/base/constructormagic.h
deleted file mode 100644
index 91e27489b1..0000000000
--- a/webrtc/overrides/webrtc/base/constructormagic.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  Copyright 2009 The WebRTC Project Authors. All rights reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-// This file overrides the inclusion of webrtc/base/constructormagic.h
-// We do this because constructor magic defines DISALLOW_COPY_AND_ASSIGN,
-// but we want to use the version from Chromium.
-
-#ifndef OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
-#define OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__
-
-#include "base/macros.h"
-
-#endif  // OVERRIDES_WEBRTC_BASE_CONSTRUCTORMAGIC_H__