Revert 232403 "Revert 232369 "Revert 232312 "Cleanup ResourceFet..."

> Revert 232369 "Revert 232312 "Cleanup ResourceFetcher in prepara..."
> 
> Revert didn't fix failing test.
> 
> > Revert 232312 "Cleanup ResourceFetcher in preparation to add to ..."
> > 
> > Seems to cause ResourceFetcherTests.ResourceFetcherDeletedInCallback
> > to timeout on Windows and crash on Linux.
> > 
> > > Cleanup ResourceFetcher in preparation to add to public content API,
> > > in preparation to move error page logic from content to chrome:
> > > 
> > > * Merge ResourceFetcher and ResourceFetcherWithTimeout.
> > > * Remove unnecessary member variables.
> > > * Remove Cancel() (All consumers were deleting and cancelling at the
> > >     same time, anyways, and deleting already cancels).
> > > * Make definition order match declaration order.
> > > * Fix outdated comments.
> > > 
> > > BUG=308232
> > > 
> > > Review URL: https://codereview.chromium.org/33363003
> > 
> > TBR=mmenke@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/55963002
> 
> TBR=csharp@chromium.org
> 
> Review URL: https://codereview.chromium.org/55943003

TBR=csharp@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232417 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 232417
Revert 232376 "Revert 232342 "New prefetch histograms to get an ..."

Didn't break bot, undoing revert.

> Revert 232342 "New prefetch histograms to get an idea of how oft..."
> 
> Broke the Linux Chromium OS ASAN Tests(3) bot.
> 
> > New prefetch histograms to get an idea of how often prefetches happen,
> > what their success rate is, how often they're canceled, how long
> > they take to load, and how big they are.
> > 
> > BUG=303816
> > 
> > Review URL: https://codereview.chromium.org/50493005
> 
> TBR=jkarlin@google.com
> 
> Review URL: https://codereview.chromium.org/55993002

TBR=csharp@chromium.org

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

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