Partially revert r54071.

Partially revert r54071.  I suspect that the web_contents_unittest.cc change was not reverted correctly.  It is causing TabContentsTest.WebKitPrefs to fail on the 472 branch.

BUG=50471
TEST=TabContentsTest.WebKitPrefs should pass again on the offical builders.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=54217

[rohitrao (ping after 24h), 2010-07-29 21:40:11]

http://codereview.chromium.org/2805089 was the original CL.

http://codereview.chromium.org/3053015 was the revert on trunk.

http://codereview.chromium.org/3036024 was the revert on the branch.


I'm trying to put the file back to what it looked like before the original CL
went in.  I think that means using the TabContentsTestingProfile and leaving out
the CreateBookmarkModel() call.

[rohitrao (ping after 24h), 2010-07-29 22:32:15]

Widening a bit, because it sounds like Miranda might be on vacation.

http://codereview.chromium.org/2805089 was the original CL.

http://codereview.chromium.org/3053015 was the revert on trunk.

http://codereview.chromium.org/3036024 was the revert on the branch.


I'm trying to put the file back to what it looked like before the original CL
went in.  I think that means using the TabContentsTestingProfile and leaving out
the CreateBookmarkModel() call.

[viettrungluu, 2010-07-29 22:53:50]

It's a bit confusing, but LGTM, I think. See if the tests go green on 472.

[John Grabowski, 2010-07-29 22:56:21]

LGTM since this appears to get things back to "before initial CL"