summaryrefslogtreecommitdiffstats
path: root/mojo/service_manager/service_manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'mojo/service_manager/service_manager.cc')
-rw-r--r--mojo/service_manager/service_manager.cc15
1 files changed, 1 insertions, 14 deletions
diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
index 05b570b..b5843cf4 100644
--- a/mojo/service_manager/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <stdio.h>
-
#include "mojo/service_manager/service_manager.h"
#include "base/lazy_instance.h"
@@ -16,11 +14,6 @@
namespace mojo {
-namespace {
-// Used by TestAPI.
-bool has_created_instance = false;
-}
-
class ServiceManager::ServiceFactory : public Shell, public ErrorHandler {
public:
ServiceFactory(ServiceManager* manager, const GURL& url)
@@ -59,11 +52,6 @@ class ServiceManager::ServiceFactory : public Shell, public ErrorHandler {
DISALLOW_COPY_AND_ASSIGN(ServiceFactory);
};
-// static
-bool ServiceManager::TestAPI::HasCreatedInstance() {
- return has_created_instance;
-}
-
bool ServiceManager::TestAPI::HasFactoryForURL(const GURL& url) const {
return manager_->url_to_service_factory_.find(url) !=
manager_->url_to_service_factory_.end();
@@ -81,10 +69,9 @@ ServiceManager::~ServiceManager() {
}
// static
-ServiceManager* ServiceManager::GetInstance() {
+ServiceManager* GetInstance() {
static base::LazyInstance<ServiceManager> instance =
LAZY_INSTANCE_INITIALIZER;
- has_created_instance = true;
return &instance.Get();
}