Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1190)

Unified Diff: mojo/service_manager/service_manager.h

Issue 208223006: Revert of Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/service_manager/service_loader.h ('k') | mojo/service_manager/service_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/service_manager/service_manager.h
diff --git a/mojo/service_manager/service_manager.h b/mojo/service_manager/service_manager.h
index b91e73ce7db460888f54b8f2c33fd74e5cab24f4..c05e1770209c849354a80eb4fcc0ea26a763311a 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;
« no previous file with comments | « mojo/service_manager/service_loader.h ('k') | mojo/service_manager/service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698