Add a scoper object for URLFetcher::Factory

content/common/url_fetcher.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains URLFetcher, a wrapper around net::URLRequest that handles
 // low-level details like thread safety, ref counting, and incremental buffer
 // reading.  This is useful for callers who simply want to get the data from a
 // URL and don't care about all the nitty-gritty details.
 //
 // NOTE(willchan): Only one "IO" thread is supported for URLFetcher.  This is a
 // temporary situation.  We will work on allowing support for multiple "io"
 // threads per process.
 
-#ifndef CONTENT_COMMON_NET_URL_FETCHER_H_
-#define CONTENT_COMMON_NET_URL_FETCHER_H_
+#ifndef CONTENT_COMMON_URL_FETCHER_H_
+#define CONTENT_COMMON_URL_FETCHER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/time.h"
 
@@ skipping 84 matching lines @@
                                          Delegate* d) = 0;
 
    protected:
     virtual ~Factory() {}
   };
 
   // |url| is the URL to send the request to.
   // |request_type| is the type of request to make.
   // |d| the object that will receive the callback on fetch completion.
   URLFetcher(const GURL& url, RequestType request_type, Delegate* d);
-
   virtual ~URLFetcher();
 
-  // Sets the factory used by the static method Create to create a URLFetcher.
-  // URLFetcher does not take ownership of |factory|. A value of NULL results
-  // in a URLFetcher being created directly.
-#if defined(UNIT_TEST)
-  static void set_factory(Factory* factory) {
-    factory_ = factory;
-  }
-#endif
-
   // Normally interception is disabled for URLFetcher, but you can use this
-  // to enable it for tests. Also see the set_factory method for another way
+  // to enable it for tests. Also see ScopedURLFetcherFactory for another way
   // of testing code that uses an URLFetcher.
   static void enable_interception_for_tests(bool enabled) {
     g_interception_enabled = enabled;
   }
 
   // Creates a URLFetcher, ownership returns to the caller. If there is no
   // Factory (the default) this creates and returns a new URLFetcher. See the
   // constructor for a description of the args. |id| may be used during testing
   // to identify who is creating the URLFetcher.
   static URLFetcher* Create(int id, const GURL& url, RequestType request_type,
@@ skipping 144 matching lines @@
   // Return a reference to the string data fetched.  Response type must
   // be STRING, or this will CHECK.  This method exists to support the
   // old signiture to OnURLFetchComplete(), and will be removed as part
   // of crbug.com/83592 .
   virtual const std::string& GetResponseStringRef() const;
 
   virtual void SetResponseDestinationForTesting(ResponseDestinationType);
   virtual ResponseDestinationType GetResponseDestinationForTesting() const;
 
  private:
+  friend class ScopedURLFetcherFactory;
+  friend class TestURLFetcher;
   friend class URLFetcherTest;
-  friend class TestURLFetcher;
 
   // Only used by URLFetcherTest, returns the number of URLFetcher::Core objects
   // actively running.
   static int GetNumFetcherCores();
 
+  static Factory* factory() { return factory_; }
+
+  // Sets the factory used by the static method Create to create a URLFetcher.
+  // URLFetcher does not take ownership of |factory|. A value of NULL results
+  // in a URLFetcher being created directly.
+  //
+  // NOTE: for safety, this should only be used through ScopedURLFetcherFactory!
+  static void set_factory(Factory* factory) {
+    factory_ = factory;
+  }
+
   class Core;
   scoped_refptr<Core> core_;
 
   static Factory* factory_;
 
   // Back-off time delay. 0 by default.
   base::TimeDelta backoff_delay_;
 
   static bool g_interception_enabled;
 
   DISALLOW_COPY_AND_ASSIGN(URLFetcher);
 };
 
-#endif  // CONTENT_COMMON_NET_URL_FETCHER_H_
+#endif  // CONTENT_COMMON_URL_FETCHER_H_