Add a new GetInstance() method for singleton classes, take 2.

chrome/browser/plugin_process_host.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/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 69 matching lines @@
 void PluginProcessHost::AddWindow(HWND window) {
   plugin_parent_windows_set_.insert(window);
 }
 
 #endif  // defined(OS_WIN)
 
 #if defined(TOOLKIT_USES_GTK)
 void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id,
                                           gfx::PluginWindowHandle* output) {
   *output = 0;
-  Singleton<GtkNativeViewManager>()->GetXIDForId(output, id);
+  GtkNativeViewManager::GetInstance()->GetXIDForId(output, id);
 }
 #endif  // defined(TOOLKIT_USES_GTK)
 
 PluginProcessHost::PluginProcessHost()
     : BrowserChildProcessHost(
           PLUGIN_PROCESS,
           PluginService::GetInstance()->resource_dispatcher_host()),
       ALLOW_THIS_IN_INITIALIZER_LIST(resolve_proxy_msg_helper_(this, NULL))
 #if defined(OS_MACOSX)
       , plugin_cursor_visible_(true)
@@ skipping 340 matching lines @@
     const std::vector<uint8>& data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ChromePluginLib *chrome_plugin = ChromePluginLib::Find(info_.path);
   if (chrome_plugin) {
     void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
     uint32 data_len = static_cast<uint32>(data.size());
     chrome_plugin->functions().on_message(data_ptr, data_len);
   }
 }