Revert 168079 - This CL ensures that favicons always

Revert 168079 - This CL ensures that favicons always
1) Stores a 1x representation in history
2) Returns a 1x representation upon calling FaviconService::GetFaviconImageForURL() such that the 1x favicon can be pushed to sync.

BUG=160503
Test=Manual, see instructions below
1) Go to http://www.corp.google.com/~pkotwicz/favicon_small_big/test.html on an iOS device and bookmark it. On the iOS device, the favicon should be red.
2) On a windows device, make sure that the favicon which is received via sync is blue

Review URL: https://chromiumcodereview.appspot.com/11360233

TBR=pkotwicz@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=168088

[pkotwicz, 2012-11-16 00:08:18]

Reverting because, this misses adding 1x for non retina devices in the supported
scale factors list