Make members of Singleton<T> private and only visible to the singleton type.

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2010 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.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
+#include "base/lazy_instance.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/waitable_event.h"
 #include "chrome/app/client_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/chrome_launcher_utils.h"
 #include "chrome_frame/crash_reporting/crash_metrics.h"
@@ skipping 533 matching lines @@
                                                    entry);
     proxies_.container().erase(it);
     lock_.Release();
   }
 
   entry->Release();
 
   return true;
 }
 
-Singleton<ProxyFactory, LeakySingletonTraits<ProxyFactory> > g_proxy_factory;
+static base::LazyInstance<ProxyFactory,
+                          base::LeakyLazyInstanceTraits<ProxyFactory> >
+    g_proxy_factory(base::LINKER_INITIALIZED);
 
 template <> struct RunnableMethodTraits<ChromeFrameAutomationClient> {
   static void RetainCallee(ChromeFrameAutomationClient* obj) {}
   static void ReleaseCallee(ChromeFrameAutomationClient* obj) {}
 };
 
 ChromeFrameAutomationClient::ChromeFrameAutomationClient()
     : chrome_frame_delegate_(NULL),
       chrome_window_(NULL),
       tab_window_(NULL),
       parent_window_(NULL),
       automation_server_(NULL),
       automation_server_id_(NULL),
       ui_thread_id_(NULL),
       init_state_(UNINITIALIZED),
       use_chrome_network_(false),
-      proxy_factory_(g_proxy_factory.get()),
+      proxy_factory_(g_proxy_factory.Pointer()),
       handle_top_level_requests_(false),
       tab_handle_(-1),
       session_id_(-1),
       external_tab_cookie_(0),
       url_fetcher_(NULL),
       url_fetcher_flags_(PluginUrlRequestManager::NOT_THREADSAFE),
       navigate_after_initialization_(false),
       route_all_top_level_navigations_(false) {
 }
 
@@ skipping 874 matching lines @@
     const URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(0, tab_->handle(),
       request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(0,
       tab_->handle(), success, url, cookie_string, cookie_id));
 }