Simplifies the code by removing condfitional section that is no longer necessary.
Simplifies the code by removing condfitional section that is no longer necessary.

git-svn-id: 2c9a99be47d0e569b9832cc4192b2d4c0ac487c7@582 861a406c-534a-0410-8894-cb66d6ee9925

grumpycoders/googletest,hazelnusse/googletest-git-clone,MoonCollider/googletest,chrisdembia/googletest,tomgr/googletest-mirror,inexor-game/googletest,svn2github/chromium-gtest,axiak/googletest,duanhjlt/gtest,imoldman/google-test-svn,skroll/gtest,fathomdb/gtest,mydrive/gtest,abyss7/googletest,scudette/gtest,martinhansdk/googletest,Luxoft/gtest,svn2github/googletest,scudette/gtest,cpp-mirrors/gtest,limbolily/gtest,martindam/googletest,ttyangf/pdfium_gtest,openpeer/gtest,if1live/googletest-svn,svn2github/gtest,open-eid/googletest,xin3liang/platform_external_chromium_org_testing_gtest,IllusionRom-deprecated/android_platform_external_chromium_org_testing_gtest,Omegaphora/external_chromium_org_testing_gtest,istarc/googletest,mydrive/gtest,Luxoft/gtest,sensorflo/gtest,dreamer-dead/google-test,martinhansdk/googletest,bastih/googletest-mirror,stp/googletest,geekboxzone/lollipop_external_chromium_org_testing_gtest,fathomdb/gtest,dustyleary/googletest,MiraGeoscience/googletest,hazelnusse/googletest-git-clone,cryporchild/googletest,JohannesEbke/gtest,IllusionRom-deprecated/android_platform_external_chromium_org_testing_gtest,xin3liang/platform_external_chromium_org_testing_gtest,balp/googletest,yinquan529/platform-external-chromium_org-testing-gtest,surtrstudios/gtest,bmatheny/gtest,liquid-mirror/googletest,MoonCollider/googletest,JohannesEbke/gtest,robbriggs/googletest,RLovelett/googletest,svn2github/chromium-gtest,stevekolk/gtest,hunter-packages/gtest,stevekolk/gtest,openpeer/gtest,martinhansdk/googletest,tomgr/googletest-mirror,dmonakhov/googletest,svn2github/googletest,okwasi/googletest,ignatz/gtest,stevekolk/gtest,surtrstudios/gtest,MoonCollider/googletest,open-eid/googletest,sensorflo/gtest,bpsinc-native/src_testing_gtest,bmatheny/gtest,grumpycoders/googletest,IllusionRom-deprecated/android_platform_external_chromium_org_testing_gtest,styxyang/googletest-git,martindam/googletest,avsej/googletest,r12f/googletest,calebthompson/googletest,liquid-mirror/googletest,FrankenBit/googletest,grumpycoders/googletest,imoldman/google-test-svn,AOSPU/external_chromium_org_testing_gtest,fathomdb/gtest,bref/googletest,hugopeixoto/googletest,dreamer-dead/google-test,ignatz/gtest,MIPS/external-chromium_org-testing-gtest,cryporchild/googletest,surtrstudios/gtest,cpp-netlib/gtest,RLovelett/googletest,plexinc/googletest,yinquan529/platform-external-chromium_org-testing-gtest,mydrive/gtest,bref/googletest,dmonakhov/googletest,bref/googletest,MiraGeoscience/googletest,sensorflo/gtest,svn2github/chromium-gtest,bpsinc-native/src_testing_gtest,JanX2/googletest,duanhjlt/gtest,maolin-cdzl/googletest,plexinc/googletest,Distrotech/googletest,xin3liang/platform_external_chromium_org_testing_gtest,JanX2/googletest,martinhansdk/googletest,notogawa/googletest,martindam/googletest,avsej/googletest,fathomdb/gtest,JanX2/googletest,styxyang/googletest-git,bmatheny/gtest,dmeister/googletest,ignatz/gtest,chrisdembia/googletest,mwoehlke/gtest,open-eid/googletest,if1live/googletest-svn,codingdojotw/gtest-mirror,geekboxzone/lollipop_external_chromium_org_testing_gtest,stp/googletest,mwoehlke/gtest,svn2github/gtest,Distrotech/googletest,robbriggs/googletest,okwasi/googletest,svn2github/googletest,MIPS/external-chromium_org-testing-gtest,emchristiansen/gtest-sbt-cpp,imoldman/google-test-svn,maolin-cdzl/googletest,plexinc/googletest,bastih/googletest-mirror,geekboxzone/lollipop_external_chromium_org_testing_gtest,notogawa/googletest,sensorflo/gtest,cpp-netlib/gtest,dreamer-dead/google-test,bmatheny/gtest,codingdojotw/gtest-mirror,liquid-mirror/googletest,inexor-game/googletest,calebthompson/googletest,alksl/googletest,dustyleary/googletest,guywithnose/android-googletest,dmonakhov/googletest,guywithnose/android-googletest,axiak/googletest,balp/googletest,emchristiansen/gtest-sbt-cpp,Distrotech/googletest,MIPS/external-chromium_org-testing-gtest,istarc/googletest,duanhjlt/gtest,dmeister/googletest,MiraGeoscience/googletest,Luxoft/gtest,bref/googletest,chrissli-u/google-test,if1live/googletest-svn,chrisdembia/googletest,xin3liang/platform_external_chromium_org_testing_gtest,IllusionRom-deprecated/android_platform_external_chromium_org_testing_gtest,AOSPU/external_chromium_org_testing_gtest,cpp-mirrors/gtest,dustyleary/googletest,dustyleary/googletest,codingdojotw/gtest-mirror,RLovelett/googletest,calebthompson/googletest,inexor-game/googletest,cryporchild/googletest,yinquan529/platform-external-chromium_org-testing-gtest,bastih/googletest-mirror,ttyangf/pdfium_gtest,hunter-packages/gtest,alksl/googletest,stp/googletest,limbolily/gtest,chrissli-u/google-test,dmeister/googletest,dreamer-dead/google-test,stp/googletest,axiak/googletest,svn2github/gtest,ttyangf/pdfium_gtest,RLovelett/googletest,emchristiansen/gtest-sbt-cpp,limbolily/gtest,aldebaran/gtest,MIPS/external-chromium_org-testing-gtest,JanX2/googletest,surtrstudios/gtest,dmeister/googletest,emchristiansen/gtest-sbt-cpp,openpeer/gtest,robbriggs/googletest,r12f/googletest,chrissli-u/google-test,codingdojotw/gtest-mirror,svn2github/gtest,Distrotech/googletest,android-ia/platform_external_chromium_org_testing_gtest,styxyang/googletest-git,abyss7/googletest,plexinc/googletest,alksl/googletest,SAPikachu/googletest,JohannesEbke/gtest,if1live/googletest-svn,ignatz/gtest,hugopeixoto/googletest,istarc/googletest,chrisdembia/googletest,SAPikachu/googletest,FrankenBit/googletest,skroll/gtest,robbriggs/googletest,styxyang/googletest-git,okwasi/googletest,FrankenBit/googletest,guywithnose/android-googletest,bpsinc-native/src_testing_gtest,imoldman/google-test-svn,guywithnose/android-googletest,r12f/googletest,mydrive/gtest,maolin-cdzl/googletest,notogawa/googletest,calebthompson/googletest,okwasi/googletest,tomgr/googletest-mirror,SAPikachu/googletest,MiraGeoscience/googletest,chrissli-u/google-test,svn2github/chromium-gtest,skroll/gtest,FrankenBit/googletest,tomgr/googletest-mirror,liquid-mirror/googletest,skroll/gtest,grumpycoders/googletest,avsej/googletest,cpp-mirrors/gtest,Omegaphora/external_chromium_org_testing_gtest,balp/googletest,JohannesEbke/gtest,stevekolk/gtest,mwoehlke/gtest,hazelnusse/googletest-git-clone,AOSPU/external_chromium_org_testing_gtest,notogawa/googletest,bastih/googletest-mirror,Omegaphora/external_chromium_org_testing_gtest,cryporchild/googletest,inexor-game/googletest,hugopeixoto/googletest,svn2github/googletest,abyss7/googletest,adblockplus/googletest,scudette/gtest,open-eid/googletest,adblockplus/googletest,hunter-packages/gtest,balp/googletest,cpp-netlib/gtest,maolin-cdzl/googletest,SAPikachu/googletest,mwoehlke/gtest,alksl/googletest,adblockplus/googletest,cpp-mirrors/gtest,android-ia/platform_external_chromium_org_testing_gtest,hazelnusse/googletest-git-clone,MoonCollider/googletest,cpp-netlib/gtest,android-ia/platform_external_chromium_org_testing_gtest,dmonakhov/googletest