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

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
+#include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 238 matching lines @@
 using webkit_glue::ImageResourceFetcher;
 using webkit_glue::PasswordForm;
 using webkit_glue::PasswordFormDomManager;
 using webkit_glue::ResourceFetcher;
 using webkit_glue::SiteIsolationMetrics;
 using webkit_glue::WebAccessibility;
 
 //-----------------------------------------------------------------------------
 
 typedef std::map<WebKit::WebView*, RenderView*> ViewMap;
+static base::LazyInstance<ViewMap> g_view_map(base::LINKER_INITIALIZED);
 
 // define to write the time necessary for thumbnail/DOM text retrieval,
 // respectively, into the system debug log
 // #define TIME_TEXT_RETRIEVAL
 
 // maximum number of characters in the document to index, any text beyond this
 // point will be clipped
 static const size_t kMaxIndexChars = 65535;
 
 // Size of the thumbnails that we'll generate
@@ skipping 318 matching lines @@
 #endif
 
   render_thread_->RemoveFilter(audio_message_filter_);
 
   // Tell the PhishingClassifierDelegate that the view is going away.
   if (phishing_delegate_.get())
     phishing_delegate_->CancelPendingClassification();
 
 #ifndef NDEBUG
   // Make sure we are no longer referenced by the ViewMap.
-  ViewMap* views = Singleton<ViewMap>::get();
+  ViewMap* views = g_view_map.Pointer();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
     DCHECK_NE(this, it->second) << "Failed to call Close?";
 #endif
 }
 
 /*static*/
 void RenderView::ForEach(RenderViewVisitor* visitor) {
-  ViewMap* views = Singleton<ViewMap>::get();
+  ViewMap* views = g_view_map.Pointer();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it) {
     if (!visitor->Visit(it->second))
       return;
   }
 }
 
 /*static*/
 RenderView* RenderView::FromWebView(WebView* webview) {
-  ViewMap* views = Singleton<ViewMap>::get();
+  ViewMap* views = g_view_map.Pointer();
   ViewMap::iterator it = views->find(webview);
   return it == views->end() ? NULL : it->second;
 }
 
 /*static*/
 RenderView* RenderView::Create(
     RenderThreadBase* render_thread,
     gfx::NativeViewId parent_hwnd,
     int32 opener_id,
     const RendererPreferences& renderer_prefs,
@@ skipping 242 matching lines @@
     shared_popup_counter_->data++;
     decrement_shared_popup_at_destruction_ = true;
   } else {
     shared_popup_counter_ = new SharedRenderViewCounter(0);
     decrement_shared_popup_at_destruction_ = false;
   }
 
   devtools_agent_.reset(new DevToolsAgent(routing_id, this));
 
   webwidget_ = WebView::create(this, devtools_agent_.get());
-  Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this));
+  g_view_map.Get().insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
   if (!frame_name.empty())
     webview()->mainFrame()->setName(frame_name);
 
   OnSetRendererPrefs(renderer_prefs);
 
   routing_id_ = routing_id;
   render_thread_->AddRoute(routing_id_, this);
   // Take a reference on behalf of the RenderThread.  This will be balanced
@@ skipping 4531 matching lines @@
     }
   }
 
   Send(new ViewMsg_ExecuteCodeFinished(routing_id_, params.request_id, true));
 }
 
 void RenderView::Close() {
   // We need to grab a pointer to the doomed WebView before we destroy it.
   WebView* doomed = webview();
   RenderWidget::Close();
-  Singleton<ViewMap>::get()->erase(doomed);
+  g_view_map.Get().erase(doomed);
 }
 
 void RenderView::DidHandleKeyEvent() {
   edit_commands_.clear();
 }
 
 void RenderView::DidHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   page_click_tracker_->DidHandleMouseEvent(event);
 }
 
@@ skipping 270 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }