Add a scoper object for URLFetcher::Factory

This should make it much safer to use (i.e. memory-safe).

BUG=90585

Review URL: http://codereview.chromium.org/7524033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94694 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 16 deletions

diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc
index 1192531..6f1e6d8 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/content/browser/geolocation/network_location_provider_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/values.h"
 #include "content/browser/geolocation/fake_access_token_store.h"
 #include "content/browser/geolocation/network_location_provider.h"
-#include "content/common/test_url_fetcher_factory.h"
+#include "content/test/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -115,7 +115,6 @@ MockDeviceDataProviderImpl<DataType>::instance_ = NULL;
 class GeolocationNetworkProviderTest : public testing::Test {
  public:
   virtual void SetUp() {
-    URLFetcher::set_factory(&url_fetcher_factory_);
     access_token_store_ = new FakeAccessTokenStore;
     gateway_data_provider_ =
         MockDeviceDataProviderImpl<GatewayData>::CreateInstance();
@@ -129,7 +128,6 @@ class GeolocationNetworkProviderTest : public testing::Test {
     WifiDataProvider::ResetFactory();
     RadioDataProvider::ResetFactory();
     GatewayDataProvider::ResetFactory();
-    URLFetcher::set_factory(NULL);
   }
 
   LocationProviderBase* CreateProvider(bool set_permission_granted) {
diff --git a/content/browser/speech/speech_recognition_request_unittest.cc b/content/browser/speech/speech_recognition_request_unittest.cc
index bb5e715..f41649c 100644
--- a/content/browser/speech/speech_recognition_request_unittest.cc
+++ b/content/browser/speech/speech_recognition_request_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/speech/speech_recognition_request.h"
-#include "content/common/test_url_fetcher_factory.h"
+#include "content/test/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -27,15 +27,6 @@ class SpeechRecognitionRequestTest : public SpeechRecognitionRequestDelegate,
     result_ = result;
   }
 
-  // testing::Test methods.
-  virtual void SetUp() {
-    URLFetcher::set_factory(&url_fetcher_factory_);
-  }
-
-  virtual void TearDown() {
-    URLFetcher::set_factory(NULL);
-  }
-
  protected:
   MessageLoop message_loop_;
   TestURLFetcherFactory url_fetcher_factory_;
diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc
index aefde20..d70df62 100644
--- a/content/browser/speech/speech_recognizer_unittest.cc
+++ b/content/browser/speech/speech_recognizer_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "content/browser/browser_thread.h"
 #include "content/browser/speech/speech_recognizer.h"
-#include "content/common/test_url_fetcher_factory.h"
+#include "content/test/test_url_fetcher_factory.h"
 #include "media/audio/test_audio_input_controller_factory.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
@@ -75,12 +75,10 @@ class SpeechRecognizerTest : public SpeechRecognizerDelegate,
 
   // testing::Test methods.
   virtual void SetUp() {
-    URLFetcher::set_factory(&url_fetcher_factory_);
     AudioInputController::set_factory(&audio_input_controller_factory_);
   }
 
   virtual void TearDown() {
-    URLFetcher::set_factory(NULL);
     AudioInputController::set_factory(NULL);
   }