Make mojo_system static and mojo_system_impl a component, never use both

mojo/system/handle_table.h

 // 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_SYSTEM_HANDLE_TABLE_H_
 #define MOJO_SYSTEM_HANDLE_TABLE_H_
 
 #include <utility>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/public/c/system/core.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace system {
 
-class CoreImpl;
+class Core;
 class Dispatcher;
 class DispatcherTransport;
 
 // Test-only function (defined/used in embedder/test_embedder.cc). Declared here
 // so it can be friended.
 namespace internal {
-bool ShutdownCheckNoLeaks(CoreImpl*);
+bool ShutdownCheckNoLeaks(Core*);
 }
 
-// This class provides the (global) handle table (owned by |CoreImpl|), which
+// This class provides the (global) handle table (owned by |Core|), which

[viettrungluu, 2014/04/09 20:26:52]

Nit: Please re-wrap this paragraph, and the next one.

[DaveMoore, 2014/04/09 22:49:08]

Done.

 // maps (valid) |MojoHandle|s to |Dispatcher|s. This is abstracted so that,
 // e.g., caching may be added.
 //
-// This class is NOT thread-safe; locking is left to |CoreImpl| (since it may
+// This class is NOT thread-safe; locking is left to |Core| (since it may
 // need to make several changes -- "atomically" or in rapid successsion, in
 // which case the extra locking/unlocking would be unnecessary overhead).
 
 class MOJO_SYSTEM_IMPL_EXPORT HandleTable {
  public:
   HandleTable();
   ~HandleTable();
 
   // Gets the dispatcher for a given handle (which should not be
   // |MOJO_HANDLE_INVALID|). Returns null if there's no dispatcher for the given
   // handle.
   // WARNING: For efficiency, this returns a dumb pointer. If you're going to
-  // use the result outside |CoreImpl|'s lock, you MUST take a reference (e.g.,
+  // use the result outside |Core|'s lock, you MUST take a reference (e.g.,

[viettrungluu, 2014/04/09 20:26:52]

"

[DaveMoore, 2014/04/09 22:49:08]

Done.

   // by storing the result inside a |scoped_refptr|).
   Dispatcher* GetDispatcher(MojoHandle handle);
 
   // On success, gets the dispatcher for a given handle (which should not be
   // |MOJO_HANDLE_INVALID|) and removes it. (On failure, returns an appropriate
   // result (and leaves |dispatcher| alone), namely
   // |MOJO_RESULT_INVALID_ARGUMENT| if there's no dispatcher for the given
   // handle or |MOJO_RESULT_BUSY| if the handle is marked as busy.)
   MojoResult GetAndRemoveDispatcher(MojoHandle handle,
                                     scoped_refptr<Dispatcher>* dispatcher);
@@ skipping 33 matching lines @@
   // Remove the given handles, which must all be present and which should have
   // previously been marked busy by |MarkBusyAndStartTransport()|.
   void RemoveBusyHandles(const MojoHandle* handles, uint32_t num_handles);
 
   // Restores the given handles, which must all be present and which should have
   // previously been marked busy by |MarkBusyAndStartTransport()|, to a non-busy
   // state.
   void RestoreBusyHandles(const MojoHandle* handles, uint32_t num_handles);
 
  private:
-  friend bool internal::ShutdownCheckNoLeaks(CoreImpl*);
+  friend bool internal::ShutdownCheckNoLeaks(Core*);
 
   struct Entry {
     Entry();
     explicit Entry(const scoped_refptr<Dispatcher>& dispatcher);
     ~Entry();
 
     scoped_refptr<Dispatcher> dispatcher;
     bool busy;
   };
   typedef base::hash_map<MojoHandle, Entry> HandleToEntryMap;
 
   // Adds the given dispatcher to the handle table, not doing any size checks.
   MojoHandle AddDispatcherNoSizeCheck(
       const scoped_refptr<Dispatcher>& dispatcher);
 
   HandleToEntryMap handle_to_entry_map_;
   MojoHandle next_handle_;  // Invariant: never |MOJO_HANDLE_INVALID|.
 
   DISALLOW_COPY_AND_ASSIGN(HandleTable);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_HANDLE_TABLE_H_