Revert of Add creation of ServiceManager to Content (https://codereview.chromium.org/187183002/)

Reason for revert:
Tests fail on Mac

Original issue's description:
> Add creation of ServiceManager to Content
> 
> BUG=None
> TEST=Mojo.Init
> R=jam@chromium.org, sky@chromium.org, jam
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258438
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258607

TBR=jam@chromium.org,sky@chromium.org,davemoore@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None

Review URL: https://codereview.chromium.org/208223006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258624 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 60 deletions

diff --git a/mojo/service_manager/service_loader.h b/mojo/service_manager/service_loader.h
index 76aaac7..7da0540 100644
--- a/mojo/service_manager/service_loader.h
+++ b/mojo/service_manager/service_loader.h
@@ -6,7 +6,6 @@
 #define MOJO_SERVICE_MANAGER_SERVICE_LOADER_H_
 
 #include "mojo/public/shell/shell.mojom.h"
-#include "mojo/service_manager/service_manager_export.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ -15,7 +14,7 @@ class ServiceManager;
 
 // Interface to allowing default loading behavior to be overridden for a
 // specific url.
-class MOJO_SERVICE_MANAGER_EXPORT ServiceLoader {
+class ServiceLoader {
  public:
   virtual ~ServiceLoader() {};
   virtual void LoadService(ServiceManager* manager,
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();
 }
 
diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h
index b91e73c..c05e177 100644
--- a/mojo/service_manager/service_manager.h
+++ b/mojo/service_manager/service_manager.h
@@ -9,30 +9,20 @@
 
 #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;
 
diff --git a/mojo/service_manager/service_manager_export.h b/mojo/service_manager/service_manager_export.h
deleted file mode 100644
index 251aad9..0000000
--- a/mojo/service_manager/service_manager_export.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 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_EXPORT_H_
-#define MOJO_SERVICE_MANAGER_SERVICE_MANAGER_EXPORT_H_
-
-#if defined(COMPONENT_BUILD)
-
-#if defined(WIN32)
-
-#if defined(MOJO_SERVICE_MANAGER_IMPLEMENTATION)
-#define MOJO_SERVICE_MANAGER_EXPORT __declspec(dllexport)
-#else
-#define MOJO_SERVICE_MANAGER_EXPORT __declspec(dllimport)
-#endif
-
-#else  // !defined(WIN32)
-
-#if defined(MOJO_SERVICE_MANAGER_IMPLEMENTATION)
-#define MOJO_SERVICE_MANAGER_EXPORT __attribute__((visibility("default")))
-#else
-#define MOJO_SERVICE_MANAGER_EXPORT
-#endif
-
-#endif  // defined(WIN32)
-
-#else  // !defined(COMPONENT_BUILD)
-#define MOJO_SERVICE_MANAGER_EXPORT
-#endif
-
-#endif  // MOJO_SERVICE_MANAGER_SERVICE_MANAGER_EXPORT_H_