summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
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/chromeos
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/chromeos')
-rw-r--r--chrome/browser/chromeos/gview_request_interceptor.cc2
-rw-r--r--chrome/browser/chromeos/gview_request_interceptor.h2
-rw-r--r--chrome/browser/chromeos/gview_request_interceptor_unittest.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc
index 69f97b2a..f656a8d 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor.cc
@@ -81,7 +81,7 @@ net::URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
}
net::URLRequest::Interceptor*
-GViewRequestInterceptor::GetGViewRequestInterceptor() {
+GViewRequestInterceptor::GetInstance() {
return Singleton<GViewRequestInterceptor>::get();
}
diff --git a/chrome/browser/chromeos/gview_request_interceptor.h b/chrome/browser/chromeos/gview_request_interceptor.h
index a8b8250..0a1691b 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.h
+++ b/chrome/browser/chromeos/gview_request_interceptor.h
@@ -32,7 +32,7 @@ class GViewRequestInterceptor : public net::URLRequest::Interceptor {
virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
// Singleton accessor.
- static net::URLRequest::Interceptor* GetGViewRequestInterceptor();
+ static net::URLRequest::Interceptor* GetInstance();
private:
friend struct DefaultSingletonTraits<GViewRequestInterceptor>;
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index ac72746..ef66061 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -51,7 +51,7 @@ class GViewRequestInterceptorTest : public testing::Test {
virtual void SetUp() {
net::URLRequest::RegisterProtocolFactory("http",
&GViewRequestInterceptorTest::Factory);
- interceptor_ = GViewRequestInterceptor::GetGViewRequestInterceptor();
+ interceptor_ = GViewRequestInterceptor::GetInstance();
ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_));
}