Fix a bad merge.
Fix a bad merge.

The check-in r62746 clobbered the changes I made in r62689 to host_resolver_impl.cc.
I believe that was an accident since r62746 moved code within the file.

TBR=jar
Review URL: http://codereview.chromium.org/3828008

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@62879 0039d316-1c4b-4281-b951-d872f2087c98

markYoungH/chromium.src,dednal/chromium.src,ondra-novak/chromium.src,timopulkkinen/BubbleFish,timopulkkinen/BubbleFish,axinging/chromium-crosswalk,ltilve/chromium,mogoweb/chromium-crosswalk,zcbenz/cefode-chromium,hgl888/chromium-crosswalk,Pluto-tv/chromium-crosswalk,ltilve/chromium,M4sse/chromium.src,ltilve/chromium,keishi/chromium,hujiajie/pa-chromium,rogerwang/chromium,Jonekee/chromium.src,nacl-webkit/chrome_deps,zcbenz/cefode-chromium,chuan9/chromium-crosswalk,PeterWangIntel/chromium-crosswalk,nacl-webkit/chrome_deps,jaruba/chromium.src,junmin-zhu/chromium-rivertrail,dushu1203/chromium.src,dushu1203/chromium.src,junmin-zhu/chromium-rivertrail,hgl888/chromium-crosswalk-efl,krieger-od/nwjs_chromium.src,nacl-webkit/chrome_deps,krieger-od/nwjs_chromium.src,ChromiumWebApps/chromium,anirudhSK/chromium,Pluto-tv/chromium-crosswalk,krieger-od/nwjs_chromium.src,mohamed--abdel-maksoud/chromium.src,dednal/chromium.src,hgl888/chromium-crosswalk,crosswalk-project/chromium-crosswalk-efl,TheTypoMaster/chromium-crosswalk,Jonekee/chromium.src,markYoungH/chromium.src,jaruba/chromium.src,Chilledheart/chromium,fujunwei/chromium-crosswalk,patrickm/chromium.src,keishi/chromium,hgl888/chromium-crosswalk,dushu1203/chromium.src,dushu1203/chromium.src,keishi/chromium,ondra-novak/chromium.src,ChromiumWebApps/chromium,patrickm/chromium.src,hujiajie/pa-chromium,markYoungH/chromium.src,chuan9/chromium-crosswalk,anirudhSK/chromium,ondra-novak/chromium.src,dushu1203/chromium.src,Chilledheart/chromium,ChromiumWebApps/chromium,Jonekee/chromium.src,Chilledheart/chromium,axinging/chromium-crosswalk,jaruba/chromium.src,hujiajie/pa-chromium,Fireblend/chromium-crosswalk,littlstar/chromium.src,hujiajie/pa-chromium,markYoungH/chromium.src,chuan9/chromium-crosswalk,Chilledheart/chromium,rogerwang/chromium,hgl888/chromium-crosswalk,rogerwang/chromium,pozdnyakov/chromium-crosswalk,hgl888/chromium-crosswalk-efl,pozdnyakov/chromium-crosswalk,hujiajie/pa-chromium,hujiajie/pa-chromium,mohamed--abdel-maksoud/chromium.src,axinging/chromium-crosswalk,Pluto-tv/chromium-crosswalk,hgl888/chromium-crosswalk-efl,dednal/chromium.src,ChromiumWebApps/chromium,jaruba/chromium.src,markYoungH/chromium.src,nacl-webkit/chrome_deps,Just-D/chromium-1,dednal/chromium.src,Fireblend/chromium-crosswalk,pozdnyakov/chromium-crosswalk,TheTypoMaster/chromium-crosswalk,Fireblend/chromium-crosswalk,Just-D/chromium-1,PeterWangIntel/chromium-crosswalk,markYoungH/chromium.src,Jonekee/chromium.src,chuan9/chromium-crosswalk,hgl888/chromium-crosswalk,anirudhSK/chromium,littlstar/chromium.src,mohamed--abdel-maksoud/chromium.src,bright-sparks/chromium-spacewalk,rogerwang/chromium,jaruba/chromium.src,hgl888/chromium-crosswalk,timopulkkinen/BubbleFish,Just-D/chromium-1,keishi/chromium,ltilve/chromium,patrickm/chromium.src,junmin-zhu/chromium-rivertrail,ltilve/chromium,hujiajie/pa-chromium,keishi/chromium,M4sse/chromium.src,keishi/chromium,bright-sparks/chromium-spacewalk,keishi/chromium,nacl-webkit/chrome_deps,Fireblend/chromium-crosswalk,timopulkkinen/BubbleFish,mohamed--abdel-maksoud/chromium.src,dushu1203/chromium.src,hgl888/chromium-crosswalk-efl,zcbenz/cefode-chromium,bright-sparks/chromium-spacewalk,fujunwei/chromium-crosswalk,anirudhSK/chromium,zcbenz/cefode-chromium,fujunwei/chromium-crosswalk,ondra-novak/chromium.src,timopulkkinen/BubbleFish,nacl-webkit/chrome_deps,Jonekee/chromium.src,mohamed--abdel-maksoud/chromium.src,Jonekee/chromium.src,bright-sparks/chromium-spacewalk,hgl888/chromium-crosswalk,dushu1203/chromium.src,patrickm/chromium.src,Pluto-tv/chromium-crosswalk,dednal/chromium.src,jaruba/chromium.src,pozdnyakov/chromium-crosswalk,hujiajie/pa-chromium,nacl-webkit/chrome_deps,hgl888/chromium-crosswalk-efl,ondra-novak/chromium.src,timopulkkinen/BubbleFish,M4sse/chromium.src,robclark/chromium,krieger-od/nwjs_chromium.src,robclark/chromium,Pluto-tv/chromium-crosswalk,ondra-novak/chromium.src,M4sse/chromium.src,dednal/chromium.src,fujunwei/chromium-crosswalk,axinging/chromium-crosswalk,timopulkkinen/BubbleFish,keishi/chromium,jaruba/chromium.src,Just-D/chromium-1,TheTypoMaster/chromium-crosswalk,patrickm/chromium.src,jaruba/chromium.src,pozdnyakov/chromium-crosswalk,anirudhSK/chromium,Chilledheart/chromium,mohamed--abdel-maksoud/chromium.src,junmin-zhu/chromium-rivertrail,junmin-zhu/chromium-rivertrail,ChromiumWebApps/chromium,PeterWangIntel/chromium-crosswalk,axinging/chromium-crosswalk,TheTypoMaster/chromium-crosswalk,krieger-od/nwjs_chromium.src,hujiajie/pa-chromium,anirudhSK/chromium,anirudhSK/chromium,ondra-novak/chromium.src,Fireblend/chromium-crosswalk,Jonekee/chromium.src,keishi/chromium,axinging/chromium-crosswalk,Pluto-tv/chromium-crosswalk,bright-sparks/chromium-spacewalk,ltilve/chromium,chuan9/chromium-crosswalk,Chilledheart/chromium,robclark/chromium,PeterWangIntel/chromium-crosswalk,robclark/chromium,Fireblend/chromium-crosswalk,ondra-novak/chromium.src,fujunwei/chromium-crosswalk,ondra-novak/chromium.src,rogerwang/chromium,littlstar/chromium.src,zcbenz/cefode-chromium,Fireblend/chromium-crosswalk,TheTypoMaster/chromium-crosswalk,crosswalk-project/chromium-crosswalk-efl,crosswalk-project/chromium-crosswalk-efl,ltilve/chromium,Chilledheart/chromium,krieger-od/nwjs_chromium.src,ChromiumWebApps/chromium,hujiajie/pa-chromium,nacl-webkit/chrome_deps,pozdnyakov/chromium-crosswalk,M4sse/chromium.src,PeterWangIntel/chromium-crosswalk,mogoweb/chromium-crosswalk,Just-D/chromium-1,mohamed--abdel-maksoud/chromium.src,robclark/chromium,Jonekee/chromium.src,junmin-zhu/chromium-rivertrail,mohamed--abdel-maksoud/chromium.src,M4sse/chromium.src,mogoweb/chromium-crosswalk,ChromiumWebApps/chromium,hgl888/chromium-crosswalk-efl,mohamed--abdel-maksoud/chromium.src,dednal/chromium.src,patrickm/chromium.src,Just-D/chromium-1,chuan9/chromium-crosswalk,markYoungH/chromium.src,M4sse/chromium.src,robclark/chromium,PeterWangIntel/chromium-crosswalk,Jonekee/chromium.src,rogerwang/chromium,fujunwei/chromium-crosswalk,junmin-zhu/chromium-rivertrail,ChromiumWebApps/chromium,anirudhSK/chromium,mohamed--abdel-maksoud/chromium.src,littlstar/chromium.src,mogoweb/chromium-crosswalk,Pluto-tv/chromium-crosswalk,robclark/chromium,dednal/chromium.src,Fireblend/chromium-crosswalk,hgl888/chromium-crosswalk-efl,hgl888/chromium-crosswalk,ChromiumWebApps/chromium,bright-sparks/chromium-spacewalk,axinging/chromium-crosswalk,M4sse/chromium.src,mogoweb/chromium-crosswalk,hgl888/chromium-crosswalk,robclark/chromium,TheTypoMaster/chromium-crosswalk,M4sse/chromium.src,ltilve/chromium,hgl888/chromium-crosswalk-efl,krieger-od/nwjs_chromium.src,zcbenz/cefode-chromium,rogerwang/chromium,crosswalk-project/chromium-crosswalk-efl,nacl-webkit/chrome_deps,krieger-od/nwjs_chromium.src,dednal/chromium.src,PeterWangIntel/chromium-crosswalk,Chilledheart/chromium,krieger-od/nwjs_chromium.src,Just-D/chromium-1,bright-sparks/chromium-spacewalk,dednal/chromium.src,jaruba/chromium.src,rogerwang/chromium,nacl-webkit/chrome_deps,markYoungH/chromium.src,pozdnyakov/chromium-crosswalk,fujunwei/chromium-crosswalk,ChromiumWebApps/chromium,timopulkkinen/BubbleFish,dushu1203/chromium.src,robclark/chromium,timopulkkinen/BubbleFish,keishi/chromium,Fireblend/chromium-crosswalk,markYoungH/chromium.src,chuan9/chromium-crosswalk,axinging/chromium-crosswalk,pozdnyakov/chromium-crosswalk,zcbenz/cefode-chromium,krieger-od/nwjs_chromium.src,dushu1203/chromium.src,timopulkkinen/BubbleFish,Just-D/chromium-1,dushu1203/chromium.src,zcbenz/cefode-chromium,crosswalk-project/chromium-crosswalk-efl,axinging/chromium-crosswalk,PeterWangIntel/chromium-crosswalk,jaruba/chromium.src,axinging/chromium-crosswalk,patrickm/chromium.src,PeterWangIntel/chromium-crosswalk,junmin-zhu/chromium-rivertrail,zcbenz/cefode-chromium,robclark/chromium,littlstar/chromium.src,anirudhSK/chromium,mogoweb/chromium-crosswalk,hgl888/chromium-crosswalk-efl,mogoweb/chromium-crosswalk,TheTypoMaster/chromium-crosswalk,dednal/chromium.src,zcbenz/cefode-chromium,Pluto-tv/chromium-crosswalk,Jonekee/chromium.src,M4sse/chromium.src,crosswalk-project/chromium-crosswalk-efl,pozdnyakov/chromium-crosswalk,axinging/chromium-crosswalk,krieger-od/nwjs_chromium.src,jaruba/chromium.src,mogoweb/chromium-crosswalk,patrickm/chromium.src,anirudhSK/chromium,fujunwei/chromium-crosswalk,timopulkkinen/BubbleFish,keishi/chromium,Jonekee/chromium.src,bright-sparks/chromium-spacewalk,patrickm/chromium.src,nacl-webkit/chrome_deps,junmin-zhu/chromium-rivertrail,junmin-zhu/chromium-rivertrail,anirudhSK/chromium,crosswalk-project/chromium-crosswalk-efl,TheTypoMaster/chromium-crosswalk,markYoungH/chromium.src,crosswalk-project/chromium-crosswalk-efl,Pluto-tv/chromium-crosswalk,bright-sparks/chromium-spacewalk,mogoweb/chromium-crosswalk,fujunwei/chromium-crosswalk,TheTypoMaster/chromium-crosswalk,rogerwang/chromium,M4sse/chromium.src,crosswalk-project/chromium-crosswalk-efl,mohamed--abdel-maksoud/chromium.src,rogerwang/chromium,ltilve/chromium,zcbenz/cefode-chromium,junmin-zhu/chromium-rivertrail,anirudhSK/chromium,chuan9/chromium-crosswalk,mogoweb/chromium-crosswalk,hujiajie/pa-chromium,markYoungH/chromium.src,Chilledheart/chromium,littlstar/chromium.src,hgl888/chromium-crosswalk-efl,littlstar/chromium.src,pozdnyakov/chromium-crosswalk,Just-D/chromium-1,chuan9/chromium-crosswalk,dushu1203/chromium.src,ChromiumWebApps/chromium,pozdnyakov/chromium-crosswalk,ChromiumWebApps/chromium,littlstar/chromium.src