Index: mojo/edk/system/mapping_table.cc |
diff --git a/third_party/mojo/src/mojo/edk/system/mapping_table.cc b/mojo/edk/system/mapping_table.cc |
similarity index 88% |
copy from third_party/mojo/src/mojo/edk/system/mapping_table.cc |
copy to mojo/edk/system/mapping_table.cc |
index 693e8d79590a57032e92a34addec1c8a8c8ab5c9..717127e5ac55e723793e167b50c7ada80a7483af 100644 |
--- a/third_party/mojo/src/mojo/edk/system/mapping_table.cc |
+++ b/mojo/edk/system/mapping_table.cc |
@@ -9,7 +9,7 @@ |
#include "mojo/edk/system/configuration.h" |
namespace mojo { |
-namespace system { |
+namespace edk { |
MappingTable::MappingTable() { |
} |
@@ -20,7 +20,7 @@ MappingTable::~MappingTable() { |
} |
MojoResult MappingTable::AddMapping( |
- scoped_ptr<embedder::PlatformSharedBufferMapping> mapping) { |
+ scoped_ptr<PlatformSharedBufferMapping> mapping) { |
DCHECK(mapping); |
if (address_to_mapping_map_.size() >= |
@@ -38,11 +38,11 @@ MojoResult MappingTable::RemoveMapping(uintptr_t address) { |
AddressToMappingMap::iterator it = address_to_mapping_map_.find(address); |
if (it == address_to_mapping_map_.end()) |
return MOJO_RESULT_INVALID_ARGUMENT; |
- embedder::PlatformSharedBufferMapping* mapping_to_delete = it->second; |
+ PlatformSharedBufferMapping* mapping_to_delete = it->second; |
address_to_mapping_map_.erase(it); |
delete mapping_to_delete; |
return MOJO_RESULT_OK; |
} |
-} // namespace system |
+} // namespace edk |
} // namespace mojo |