Revert of Add creation of ServiceManager to Content

mojo/service_manager/service_manager.h

 // 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.
 
 #ifndef MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 #define MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/gtest_prod_util.h"
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/service_manager/service_manager_export.h"
 #include "url/gurl.h"
 
-namespace content {
-  class MojoTest;
-}
-
 namespace mojo {
 
 class ServiceLoader;
 
-class MOJO_SERVICE_MANAGER_EXPORT ServiceManager {
+class ServiceManager {
  public:
   // API for testing.
-  class MOJO_SERVICE_MANAGER_EXPORT TestAPI {
+  class TestAPI {
    private:
     friend class ServiceManagerTest;
-    friend class content::MojoTest;
-
     explicit TestAPI(ServiceManager* manager) : manager_(manager) {}
-    // Returns true if the shared instance has been created.
-    static bool HasCreatedInstance();
     // Returns true if there is a ServiceFactory for this URL.
     bool HasFactoryForURL(const GURL& url) const;
 
     ServiceManager* manager_;
   };
 
   ServiceManager();
   ~ServiceManager();
 
   // Returns a shared instance, creating it if necessary.
@@ skipping 20 matching lines @@
   typedef std::map<GURL, ServiceFactory*> ServiceFactoryMap;
   ServiceFactoryMap url_to_service_factory_;
   typedef std::map<GURL, ServiceLoader*> LoaderMap;
   LoaderMap url_to_loader_;
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICE_MANAGER_SERVICE_MANAGER_H_