Revert of Add creation of ServiceManager to Content

mojo/service_manager/service_manager.cc

Index: mojo/service_manager/service_manager.cc
diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
index 05b570bfdef1d78dd5ae95417d5a2beee03c8078..b5843cf42343372bb98021779315c77737349a52 100644
--- a/mojo/service_manager/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -1,8 +1,6 @@
 // Copyright 2013 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 <stdio.h>
 
 #include "mojo/service_manager/service_manager.h"
 
@@ -15,11 +13,6 @@
 #include "mojo/service_manager/service_loader.h"
 
 namespace mojo {
-
-namespace {
-// Used by TestAPI.
-bool has_created_instance = false;
-}
 
 class ServiceManager::ServiceFactory : public Shell, public ErrorHandler {
  public:
@@ -59,11 +52,6 @@
   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 @@
 }
 
 // static
-ServiceManager* ServiceManager::GetInstance() {
+ServiceManager* GetInstance() {
   static base::LazyInstance<ServiceManager> instance =
       LAZY_INSTANCE_INITIALIZER;
-  has_created_instance = true;
   return &instance.Get();
 }