This is a continuation of http://codereview.chromium.org/5519016/, adds a new GetInstance() method for remaining files with singleton classes under chrome/browser.

For types declared and used within the same .cc file, I changed them over to LazyInstance<T>.

BUG=65298
TEST=all existing tests should continue to pass.

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

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

1 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/gview_request_interceptor.h b/chrome/browser/chromeos/gview_request_interceptor.h
index 7642d1d..cd8dfde 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.h
+++ b/chrome/browser/chromeos/gview_request_interceptor.h
@@ -10,6 +10,8 @@
 #include "base/hash_tables.h"
 #include "net/url_request/url_request.h"
 
+template <typename T> struct DefaultSingletonTraits;
+
 namespace chromeos {
 
 // This class integrates the Google Document Viewer into ChromeOS,
@@ -20,9 +22,6 @@ namespace chromeos {
 // parameter.
 class GViewRequestInterceptor : public net::URLRequest::Interceptor {
  public:
-  GViewRequestInterceptor();
-  virtual ~GViewRequestInterceptor();
-
   // Always returns NULL because we don't want to attempt a redirect
   // before seeing the detected mime type of the request.
   virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
@@ -36,6 +35,11 @@ class GViewRequestInterceptor : public net::URLRequest::Interceptor {
   static net::URLRequest::Interceptor* GetGViewRequestInterceptor();
 
  private:
+  friend struct DefaultSingletonTraits<GViewRequestInterceptor>;
+
+  GViewRequestInterceptor();
+  virtual ~GViewRequestInterceptor();
+
   // The list of supported mime types.
   base::hash_set<std::string> supported_mime_types_;
 };