Revert "Further cleanup of shouldoverrideUrlloading change"

Bug: 11041218

This reverts commit daf6d950dbe218e72e9579598566ef2391472529 which
is the second piece of 0a8f47fbce7f94803320e0340e8fe7855159e31a.
Reverted for the same reason as explained in
  f4dddd43d60c5820a173ba337a00ea490a5e1a93
1 file changed