Fixes the build of Linux GTK+.

Some of refactoring weren't applied to Linux GTK+ build.  So fixes it.

TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247501 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 247501
Add support for two arguments to base::BindBlock.

BUG=None

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

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