Consolidate constructormagic macros with Chromium version and remove Chromium override.

Consolidate constructormagic macros with Chromium version and remove Chromium override.

Part of work removing dependency on Chromium's base.

Only adds "= delete". From https://codereview.chromium.org/1151443003 :
"This will guarantee the error to be at compile time, and not rely on the call visibility (private)."

In consequence of that change, fixed an illegal copy and removed a bunch of unused variables.

BUG=chromium:468375
(in particular comment #37)
NOTRY=true

Committed: https://crrev.com/0de8ff488d92e0bc6b7b65662898ff5e955cda93
Cr-Commit-Position: refs/heads/master@{#9913}

[Henrik Grunell WebRTC, 2015-09-07 11:09:51]

henrikg@webrtc.org changed reviewers:
+ andrew@webrtc.org, tommi@webrtc.org

[tommi, 2015-09-07 11:15:27]

lgtm

feel free to ignore the question below.

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic.h
File webrtc/base/constructormagic.h (right):

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic....
webrtc/base/constructormagic.h:20: void operator=(const TypeName&) = delete
nit: 4 spaces?

[Henrik Grunell WebRTC, 2015-09-07 11:56:40]

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic.h
File webrtc/base/constructormagic.h (right):

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic....
webrtc/base/constructormagic.h:20: void operator=(const TypeName&) = delete
On 2015/09/07 11:15:27, tommi (webrtc) wrote:
> nit: 4 spaces?

2 spaces in base/macros.h.

[Andrew MacDonald, 2015-09-07 22:45:37]

lgtm assuming you agree with fixing DISALLOW_COPY_AND_ASSIGN.

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic.h
File webrtc/base/constructormagic.h (right):

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic....
webrtc/base/constructormagic.h:25: #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
Any reason not to fix this one as well?

TypeName(const TypeName&) = delete;
DISALLOW_ASSIGN(TypeName)

If so, remove "private: " above.

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic....
webrtc/base/constructormagic.h:32: // This should be used in the private:
declarations for a class
Remove "private: ".

[Henrik Grunell WebRTC, 2015-09-08 11:41:09]

Also fixed a copy and removed some unused variables. All found thanks to the
update. :)

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic.h
File webrtc/base/constructormagic.h (right):

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic....
webrtc/base/constructormagic.h:25: #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
On 2015/09/07 22:45:36, Andrew MacDonald wrote:
> Any reason not to fix this one as well?
> 
> TypeName(const TypeName&) = delete;
> DISALLOW_ASSIGN(TypeName)
> 
> If so, remove "private: " above.

Ah, good catch. It's like this in Chromium because it's redefined in some
places. That's not the case in WebRTC. Done.

https://codereview.webrtc.org/1316363005/diff/1/webrtc/base/constructormagic....
webrtc/base/constructormagic.h:32: // This should be used in the private:
declarations for a class
On 2015/09/07 22:45:36, Andrew MacDonald wrote:
> Remove "private: ".

Done.

[Henrik Grunell WebRTC, 2015-09-08 11:41:16]

The CQ bit was checked by henrikg@webrtc.org

[Henrik Grunell WebRTC, 2015-09-08 11:41:17]

The patchset sent to the CQ was uploaded after l-g-t-m from tommi@webrtc.org,
andrew@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1316363005/#ps20001 (title:
"Code review. Removed unused variables in various files.")

[commit-bot: I haz the power, 2015-09-08 11:41:24]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1316363005/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1316363005/20001

[commit-bot: I haz the power, 2015-09-08 11:48:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-08 11:48:02]

Try jobs failed on following builders:
  mac_x64 on tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/mac_x64/builds/3174)

[Henrik Grunell WebRTC, 2015-09-08 12:10:15]

The CQ bit was checked by henrikg@webrtc.org

[Henrik Grunell WebRTC, 2015-09-08 12:10:15]

The patchset sent to the CQ was uploaded after l-g-t-m from tommi@webrtc.org,
andrew@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1316363005/#ps40001 (title:
"Removed more unused variables.")

[commit-bot: I haz the power, 2015-09-08 12:10:21]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1316363005/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1316363005/40001

[commit-bot: I haz the power, 2015-09-08 14:10:38]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-08 14:10:39]

Try jobs failed on following builders:
  android on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  android_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_baremetal on tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[Henrik Grunell WebRTC, 2015-09-09 15:51:22]

The CQ bit was checked by henrikg@webrtc.org

[Henrik Grunell WebRTC, 2015-09-09 15:51:23]

The patchset sent to the CQ was uploaded after l-g-t-m from tommi@webrtc.org,
andrew@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1316363005/#ps60001 (title:
"Rebase.")

[commit-bot: I haz the power, 2015-09-09 15:51:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1316363005/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1316363005/60001

[commit-bot: I haz the power, 2015-09-09 17:51:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-09 17:51:43]

Try jobs failed on following builders:
  mac_baremetal on tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[Henrik Grunell WebRTC, 2015-09-10 04:31:25]

The CQ bit was checked by henrikg@webrtc.org

[commit-bot: I haz the power, 2015-09-10 04:31:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1316363005/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1316363005/60001

[commit-bot: I haz the power, 2015-09-10 05:28:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-09-10 05:28:06]

Try jobs failed on following builders:
  mac_baremetal on tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/mac_baremetal/builds/7279)

[Henrik Grunell WebRTC, 2015-09-10 06:42:35]

The CQ bit was checked by henrikg@webrtc.org

[commit-bot: I haz the power, 2015-09-10 06:42:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1316363005/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1316363005/60001

[commit-bot: I haz the power, 2015-09-10 06:43:45]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-09-10 06:43:59]

Patchset 4 (id:??) landed as
https://crrev.com/0de8ff488d92e0bc6b7b65662898ff5e955cda93
Cr-Commit-Position: refs/heads/master@{#9913}

[tommi, 2015-09-10 08:41:39]

A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.webrtc.org/1330283002/ by tommi@webrtc.org.

The reason for reverting is: Had to revert since FYI bots stopped compiling. 
Example failure:

[94/9470] CXX
obj\third_party\webrtc\modules\video_processing\main\source\video_processing_sse2.content_analysis_sse2.obj
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc
"E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\third_party\webrtc\modules\video_coding\codecs\h264\webrtc_h264.h264.obj.rsp
/c ..\..\third_party\webrtc\modules\video_coding\codecs\h264\h264.cc
/Foobj\third_party\webrtc\modules\video_coding\codecs\h264\webrtc_h264.h264.obj
/Fdobj\third_party\webrtc\modules\webrtc_h264.cc.pdb 
e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated
as error - no 'object' file generated
e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005:
'DISALLOW_COPY_AND_ASSIGN' : macro redefinition
       
e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) :
see previous definition of 'DISALLOW_COPY_AND_ASSIGN'
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc
"E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\third_party\webrtc\base\rtc_base_approved.bitbuffer.obj.rsp /c
..\..\third_party\webrtc\base\bitbuffer.cc
/Foobj\third_party\webrtc\base\rtc_base_approved.bitbuffer.obj
/Fdobj\third_party\webrtc\base\rtc_base_approved.cc.pdb 
e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated
as error - no 'object' file generated
e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005:
'DISALLOW_COPY_AND_ASSIGN' : macro redefinition
       
e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) :
see previous definition of 'DISALLOW_COPY_AND_ASSIGN'
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc
"E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\third_party\webrtc\modules\audio_processing\logging\audio_processing.aec_logging_file_handling.obj.rsp
/c
..\..\third_party\webrtc\modules\audio_processing\logging\aec_logging_file_handling.cc
/Foobj\third_party\webrtc\modules\audio_processing\logging\audio_processing.aec_logging_file_handling.obj
/Fdobj\third_party\webrtc\modules\audio_processing.cc.pdb 
e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated
as error - no 'object' file generated
e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005:
'DISALLOW_COPY_AND_ASSIGN' : macro redefinition
       
e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) :
see previous definition of 'DISALLOW_COPY_AND_ASSIGN'
FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc
"E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo
/showIncludes /FC
@obj\third_party\webrtc\modules\audio_processing\beamformer\audio_processing.nonlinear_beamformer.obj.rsp
/c
..\..\third_party\webrtc\modules\audio_processing\beamformer\nonlinear_beamformer.cc
/Foobj\third_party\webrtc\modules\audio_processing\beamformer\audio_processing.nonlinear_beamformer.obj
/Fdobj\third_party\webrtc\modules\audio_processing.cc.pdb 
e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated
as error - no 'object' file generated
e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005:
'DISALLOW_COPY_AND_ASSIGN' : macro redefinition
       
e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) :
see previous definition of 'DISALLOW_COPY_AND_ASSIGN'.