EME: Enable both ENCRYPTED_MEDIA and ENCRYPTED_MEDIA_V2 until clients transition to the new API.
https://bugs.webkit.org/show_bug.cgi?id=110284

Reviewed by Eric Carlson.

Re-enable the ENCRYPTED_MEDIA flag.

* Configurations/FeatureDefines.xcconfig:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@143509 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Add gyp option to switch ENABLE(SQL_DATABASE)
https://bugs.webkit.org/show_bug.cgi?id=109303
http://code.google.com/p/chromium/issues/detail?id=22208

Patch by Paweł Hajdan, Jr. <phajdan.jr@chromium.org> on 2013-02-20
Reviewed by Tony Chang.

This will be useful to implement build with system sqlite.

* features.gypi:
* src/ChromeClientImpl.cpp:
(WebKit):
* src/ChromeClientImpl.h:
(ChromeClientImpl):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@143511 268f45cc-cd09-0410-ab3c-d52691b4dbfc