Recover version 6 Favicons, fix meta table.

Version 6 is exactly like version 7, except it has an extra trailing
column on favicons which was never used.  The version-7 recovery code
works for it, so long as the meta table is updated correctly.

In writing this change, I realized that the meta table wasn't being
created for recovered databases.  Instead, SQLite was resolving to the
corrupt.meta table.  This works so long as the version doesn't change
(next open will populate meta with kCurrentVersion).  This change
makes the table references absolute, and fixes the meta table setup.

BUG=240396
R=jar@chromium.org, pkotwicz@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/25032004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228217 0039d316-1c4b-4281-b951-d872f2087c98
[NaCl SDK] nacl_io: Fix bug poll() with listening on multiple fds

When multiple emitter were passed to poll only
the first emitter in the list of being used and
have RegisterListener() called mutiple times.

BUG=
R=noelallen@chromium.org

Review URL: https://codereview.chromium.org/26522005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228218 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 228218