Revert 246705 "This is a modified https://codereview.chromium.or..."

This may be causing testOpenProfileSettingsReset to timeout.

> This is a modified https://codereview.chromium.org/116143003/. The original patch was reverted (https://codereview.chromium.org/134873009) because enumerating shortcuts on the FILE thread was a huge task and it wasn't cancelled on browser shutdown. Now it's cancelable. The task is cancelled if the corresponding ResettableSettingsSnapshot destroyed. It happens if user closes chrome://settings tab.
> 
> BUG=324931
> TBR=jyasskin@chromium.org
> 
> Review URL: https://codereview.chromium.org/137533010

TBR=vasilii@chromium.org

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

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

http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog_blink.html?url=/trunk&range=165654:165660&mode=html
TBR=
BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246745 0039d316-1c4b-4281-b951-d872f2087c98
Make CertLoader/TPMTokenLoader::Observer dtor protected

TEST=compiles
BUG=NONE

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246746 0039d316-1c4b-4281-b951-d872f2087c98
Update .DEPS.git

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