| Index: base/memory/shared_memory_unittest.cc
|
| diff --git a/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc
|
| index 6e5a4d8f7ee6cdee7c025fc0d048a44a3ba8247d..cb5982e8a2ea3d11812c1e38bf439987c8be7b85 100644
|
| --- a/base/memory/shared_memory_unittest.cc
|
| +++ b/base/memory/shared_memory_unittest.cc
|
| @@ -65,7 +65,7 @@ class MultipleThreadMain : public PlatformThread::Delegate {
|
| EXPECT_TRUE(rv);
|
| rv = memory.Map(kDataSize);
|
| EXPECT_TRUE(rv);
|
| - int *ptr = static_cast<int*>(memory.memory()) + id_;
|
| + int* ptr = static_cast<int*>(memory.memory()) + id_;
|
| EXPECT_EQ(0, *ptr);
|
|
|
| for (int idx = 0; idx < 100; idx++) {
|
| @@ -82,12 +82,12 @@ class MultipleThreadMain : public PlatformThread::Delegate {
|
| private:
|
| int16 id_;
|
|
|
| - static const char* const s_test_name_;
|
| + static const char s_test_name_[];
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MultipleThreadMain);
|
| };
|
|
|
| -const char* const MultipleThreadMain::s_test_name_ =
|
| +const char MultipleThreadMain::s_test_name_[] =
|
| "SharedMemoryOpenThreadTest";
|
|
|
| // TODO(port):
|
| @@ -104,7 +104,7 @@ class MultipleLockThread : public PlatformThread::Delegate {
|
| virtual ~MultipleLockThread() {}
|
|
|
| // PlatformThread::Delegate interface.
|
| - virtual void ThreadMain() override {
|
| + void ThreadMain() override {
|
| const uint32 kDataSize = sizeof(int);
|
| SharedMemoryHandle handle = NULL;
|
| {
|
| @@ -179,8 +179,8 @@ TEST(SharedMemoryTest, OpenClose) {
|
|
|
| // Close the first memory segment, and verify the second has the right data.
|
| memory1.Close();
|
| - char *start_ptr = static_cast<char *>(memory2.memory());
|
| - char *end_ptr = start_ptr + kDataSize;
|
| + char* start_ptr = static_cast<char*>(memory2.memory());
|
| + char* end_ptr = start_ptr + kDataSize;
|
| for (char* ptr = start_ptr; ptr < end_ptr; ptr++)
|
| EXPECT_EQ(*ptr, '1');
|
|
|
| @@ -246,8 +246,8 @@ TEST(SharedMemoryTest, OpenExclusive) {
|
| kDataSize2 + base::SysInfo::VMAllocationGranularity());
|
|
|
| // Verify that opening memory2 didn't truncate or delete memory 1.
|
| - char *start_ptr = static_cast<char *>(memory2.memory());
|
| - char *end_ptr = start_ptr + kDataSize;
|
| + char* start_ptr = static_cast<char*>(memory2.memory());
|
| + char* end_ptr = start_ptr + kDataSize;
|
| for (char* ptr = start_ptr; ptr < end_ptr; ptr++) {
|
| EXPECT_EQ(*ptr, 'G');
|
| }
|
| @@ -365,7 +365,7 @@ TEST(SharedMemoryTest, AnonymousPrivate) {
|
| for (i = 0; i < count; i++) {
|
| rv = memories[i].CreateAndMapAnonymous(kDataSize);
|
| EXPECT_TRUE(rv);
|
| - int *ptr = static_cast<int*>(memories[i].memory());
|
| + int* ptr = static_cast<int*>(memories[i].memory());
|
| EXPECT_TRUE(ptr);
|
| pointers[i] = ptr;
|
| }
|
| @@ -653,7 +653,6 @@ TEST(SharedMemoryTest, MapMinimumAlignment) {
|
| // not just across threads. But the test is enabled on all platforms.
|
| class SharedMemoryProcessTest : public MultiProcessTest {
|
| public:
|
| -
|
| static void CleanUp() {
|
| SharedMemory memory;
|
| memory.Delete(s_test_name_);
|
| @@ -674,7 +673,7 @@ class SharedMemoryProcessTest : public MultiProcessTest {
|
| EXPECT_TRUE(rv);
|
| if (rv != true)
|
| errors++;
|
| - int *ptr = static_cast<int*>(memory.memory());
|
| + int* ptr = static_cast<int*>(memory.memory());
|
|
|
| for (int idx = 0; idx < 20; idx++) {
|
| memory.LockDeprecated();
|
| @@ -691,10 +690,10 @@ class SharedMemoryProcessTest : public MultiProcessTest {
|
| }
|
|
|
| private:
|
| - static const char* const s_test_name_;
|
| + static const char s_test_name_[];
|
| };
|
|
|
| -const char* const SharedMemoryProcessTest::s_test_name_ = "MPMem";
|
| +const char SharedMemoryProcessTest::s_test_name_[] = "MPMem";
|
|
|
| TEST_F(SharedMemoryProcessTest, Tasks) {
|
| SharedMemoryProcessTest::CleanUp();
|
|
|