summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_plugin_host.cc
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 08:18:55 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 08:18:55 +0000
commit8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a (patch)
treea7425d106d83f1f031516e18ea9600363341fdb8 /chrome/browser/chrome_plugin_host.cc
parent1bc1c69f95dab2c34232a5c8793cf9db51af2386 (diff)
downloadchromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.zip
chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.gz
chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.bz2
Rename all methods accessing Singleton<T> as GetInstance().
This is in preparation to a subsequent CL where Singleton<T> will restrict access to only the type being made singleton. I also moved pepper::ResourceTracker to a lazy instance since there were too many places in code where this class was being accessed from and this was a smaller change than renaming methods in that case. BUG=65298 TEST=all existing tests should pass. Review URL: http://codereview.chromium.org/5685007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_plugin_host.cc')
-rw-r--r--chrome/browser/chrome_plugin_host.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index 9248036..b339b46 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -109,7 +109,7 @@ class PluginRequestInterceptor
return NULL;
CPBrowsingContext context =
- CPBrowsingContextManager::Instance()->Lookup(request->context());
+ CPBrowsingContextManager::GetInstance()->Lookup(request->context());
scoped_ptr<ScopableCPRequest> cprequest(
new ScopableCPRequest(request->url().spec().c_str(),
request->method().c_str(),
@@ -156,7 +156,7 @@ class PluginRequestHandler : public PluginHelper,
: PluginHelper(plugin), cprequest_(cprequest), user_buffer_(NULL) {
cprequest_->data = this; // see FromCPRequest().
- URLRequestContext* context = CPBrowsingContextManager::Instance()->
+ URLRequestContext* context = CPBrowsingContextManager::GetInstance()->
ToURLRequestContext(cprequest_->context);
// TODO(mpcomplete): remove fallback case when Gears support is prevalent.
if (!context)
@@ -386,7 +386,7 @@ void STDCALL CPB_SetKeepProcessAlive(CPID id, CPBool keep_alive) {
CPError STDCALL CPB_GetCookies(CPID id, CPBrowsingContext bcontext,
const char* url, char** cookies) {
CHECK(ChromePluginLib::IsPluginThread());
- URLRequestContext* context = CPBrowsingContextManager::Instance()->
+ URLRequestContext* context = CPBrowsingContextManager::GetInstance()->
ToURLRequestContext(bcontext);
// TODO(mpcomplete): remove fallback case when Gears support is prevalent.
if (!context) {