Fix build. Switch to a new way of spoofing prctl.

The code so far relied on using a different definition
from the bionic one, so there was no conflict. However bionic
changed to move to the same definition, which caused a conflict
at the C++ level. This uses the preprocessor to eliminate the
conflict, by first including the headers that would be afected
by the preprocessor trick and then redefining the function in
question with the preprocessor.

None of the call sites rely on side effects of evaluating
parameters to prctl, so it's OK to have the preprocessor
swallow them.

Change-Id: Id33ec44d4faf0e50f4dcea4b3c073f6318e3bba5
am 5d10d1b0: Fix build. Switch to a new way of spoofing prctl.

* commit '5d10d1b0b2dff8fed028360ff8fb6ab715cb53e8':
  Fix build. Switch to a new way of spoofing prctl.
Merge bd61185cb9da2edfd394e469f2db9291cbfaf238

Change-Id: Iba8f33b2c2dc3c77a2872c9eb2297757167c8cb7
Add ScopedOpenSSL::release like scoped_refptr::release

Change-Id: I1d6c19f12f2b78f95ee1e54015c8e1a02f12c7f1
Increase EVP_PKEY reference count before passing value to OpenSSL

Change-Id: I97a4b1109bb953427216efde1904c7084f47ef2a
Add a null pointer check in ApplyCwndFieldTrial

Find("SpdyCwnd") is sometimes coming back null. This guards against
that case.

http://codereview.chromium.org/6877124/

Change-Id: Ic6da3c39049397b7e430797a43ab0df30df277d2
Merge "Add a null pointer check in ApplyCwndFieldTrial"
File not used, matching upstream to avoid conflicts.

Change-Id: Iee92f225644e96852796596a25f571e05ebf28a7
Reduce pref usage by autofill

Try to avoid using prefs in Android. We are not using
the entire system, and we have significant local edits.

Will try to remove the local edits in prefs and
keep them in autofill. We should not loose any
functionality as there is no way for the user
to change the prefs.

Change-Id: I5ee38228fa552127a0399390a617e1a324e75d86
Merge Chromium.org at r11.0.672.0: Initial merge by git.

Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Merge Chromium at r11.0.672.0: Fix conflicts in logging.cc

This CL was close to our local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/base/logging.cc?view=diff&pathrev=74924&r1=70976&r2=70977

Change-Id: I9b689dfe5cd85dc069923207aaf222a33109120b
Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.cc

Changes around local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/base/shared_memory_posix.cc?view=diff&r1=70974&r2=70975

Change-Id: I3c06547ed799c4b1048163cb98b0c0da05ad7cf6
Merge Chromium at r11.0.672.0: Fix conflicts in net_util.cc

Include removed in CL:
http://codereview.chromium.org/6394004

Change-Id: I8a0c21f69be740705b6dedaaaccb4615deb878c6
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket.h

New comment close to local edit in CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_proxy_client_socket.h?view=diff&pathrev=74924&r1=71879&r2=71880

Change-Id: Ibfb86a744ebb2172009bf0a8cce8bee62ddc7275
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.cc

Function with local edits moved in chromium:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_proxy_client_socket_pool.cc?view=diff&pathrev=74924&r1=72161&r2=72162

Removed local TODO comment as it is not needed.

Change-Id: I39c1e29e219afd438fb6763354104d7ac5300f89
Merge Chromium at r11.0.672.0: Fix conflicts in tcp_client_socket_libevent.cc

Got the cherry pick for keep-alive, added guards around local Android edit.
http://codereview.chromium.org/6162005

Change-Id: I55c66cce1888dd195e14c7f932a651fda919d405
Merge Chromium at r11.0.672.0: Fix conflicts in url_request_http_job.cc

Large refactoring upstream:
http://codereview.chromium.org/6382003

Will look at removing the local edit after the merge.

Change-Id: I9547a3c82e9a4193d854f306c8374dd82ad2ae43
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_dialog.h

gfx/* moved to ui/gfx/* upstream:
http://codereview.chromium.org/6312156

Change-Id: Icbc82026a2496a0a7ddbd0069b558973ba7ec620
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.h

Upstream change close to local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?r1=70351&r2=72489&pathrev=74924

Change-Id: Ie63b95f5e21893a79f764509a5020017c7da08e9
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_downlad.cc

Local commit between two remote changes:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=74924&r1=72584&r2=72585
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=74924&r1=72787&r2=72788
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?r1=73232&r2=73921&pathrev=77261

Android doesn't need to be forced into the list as official build
anymore since autofill is enabled for all versions.

Change-Id: I13ae0d9724d61f49aba5fc4108605cd4921c8345