summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 02:47:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 02:47:39 +0000
commitc2818d44191bc4342c2ae322f3e0cb218dd2ec66 (patch)
treede6265a7e8506e6df679a436cb4df1cd7281a614 /gpu
parente8b53808f5251d1486dd8b992fa94d96bb604e01 (diff)
downloadchromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.zip
chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.tar.gz
chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.tar.bz2
Move scoped_nsdisable_screen_update from base to app/mac
Move scoped_aedesc from base to base/mac Use namespace and proper Google-style class naming. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3828009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/client/cmd_buffer_helper_test.cc4
-rw-r--r--gpu/command_buffer/client/fenced_allocator_test.cc4
-rw-r--r--gpu/command_buffer/client/mapped_memory_unittest.cc4
-rw-r--r--gpu/command_buffer/client/ring_buffer_test.cc4
-rw-r--r--gpu/command_buffer/service/command_buffer_service_unittest.cc6
-rw-r--r--gpu/command_buffer/service/gpu_processor_unittest.cc6
6 files changed, 14 insertions, 14 deletions
diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
index 6b5a9cf..9f526df 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
@@ -5,8 +5,8 @@
// Tests for the Command Buffer Helper.
#include "base/callback.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/message_loop.h"
-#include "base/scoped_nsautorelease_pool.h"
#include "gpu/command_buffer/client/cmd_buffer_helper.h"
#include "gpu/command_buffer/service/mocks.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
@@ -152,7 +152,7 @@ class CommandBufferHelperTest : public testing::Test {
CommandBufferOffset get_helper_put() { return helper_->put_; }
- base::ScopedNSAutoreleasePool autorelease_pool_;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool_;
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
index 4b66aab..658deef2 100644
--- a/gpu/command_buffer/client/fenced_allocator_test.cc
+++ b/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -6,7 +6,7 @@
#include "base/callback.h"
#include "base/message_loop.h"
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "gpu/command_buffer/client/cmd_buffer_helper.h"
#include "gpu/command_buffer/client/fenced_allocator.h"
#include "gpu/command_buffer/service/cmd_buffer_engine.h"
@@ -66,7 +66,7 @@ class BaseFencedAllocatorTest : public testing::Test {
return command_buffer_->GetState().token;
}
- base::ScopedNSAutoreleasePool autorelease_pool_;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool_;
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
diff --git a/gpu/command_buffer/client/mapped_memory_unittest.cc b/gpu/command_buffer/client/mapped_memory_unittest.cc
index 4728aee..fe0a0a9 100644
--- a/gpu/command_buffer/client/mapped_memory_unittest.cc
+++ b/gpu/command_buffer/client/mapped_memory_unittest.cc
@@ -5,7 +5,7 @@
#include "gpu/command_buffer/client/mapped_memory.h"
#include "base/callback.h"
#include "base/message_loop.h"
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/scoped_ptr.h"
#include "gpu/command_buffer/client/cmd_buffer_helper.h"
#include "gpu/command_buffer/service/mocks.h"
@@ -64,7 +64,7 @@ class MappedMemoryTestBase : public testing::Test {
return command_buffer_->GetState().token;
}
- base::ScopedNSAutoreleasePool autorelease_pool_;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool_;
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc
index 9ccb9b43..6510611 100644
--- a/gpu/command_buffer/client/ring_buffer_test.cc
+++ b/gpu/command_buffer/client/ring_buffer_test.cc
@@ -7,7 +7,7 @@
#include "gpu/command_buffer/client/ring_buffer.h"
#include "base/callback.h"
#include "base/message_loop.h"
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "gpu/command_buffer/client/cmd_buffer_helper.h"
#include "gpu/command_buffer/service/cmd_buffer_engine.h"
#include "gpu/command_buffer/service/mocks.h"
@@ -67,7 +67,7 @@ class BaseRingBufferTest : public testing::Test {
return command_buffer_->GetState().token;
}
- base::ScopedNSAutoreleasePool autorelease_pool_;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool_;
MessageLoop message_loop_;
scoped_ptr<AsyncAPIMock> api_mock_;
scoped_ptr<CommandBufferService> command_buffer_;
diff --git a/gpu/command_buffer/service/command_buffer_service_unittest.cc b/gpu/command_buffer/service/command_buffer_service_unittest.cc
index 713c9a5..1dee78e 100644
--- a/gpu/command_buffer/service/command_buffer_service_unittest.cc
+++ b/gpu/command_buffer/service/command_buffer_service_unittest.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
#include "base/callback.h"
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/thread.h"
#include "gpu/command_buffer/common/cmd_buffer_common.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
@@ -41,7 +41,7 @@ class CommandBufferServiceTest : public testing::Test {
return command_buffer_->GetState().error;
}
- base::ScopedNSAutoreleasePool autorelease_pool_;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool_;
scoped_ptr<CommandBufferService> command_buffer_;
};
diff --git a/gpu/command_buffer/service/gpu_processor_unittest.cc b/gpu/command_buffer/service/gpu_processor_unittest.cc
index f6a2f16..69adf03 100644
--- a/gpu/command_buffer/service/gpu_processor_unittest.cc
+++ b/gpu/command_buffer/service/gpu_processor_unittest.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/message_loop.h"
-#include "base/scoped_nsautorelease_pool.h"
#include "gpu/command_buffer/common/command_buffer_mock.h"
#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/gpu_processor.h"
@@ -77,7 +77,7 @@ class GPUProcessorTest : public testing::Test {
return command_buffer_->GetState().error;
}
- base::ScopedNSAutoreleasePool autorelease_pool_;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool_;
MessageLoop message_loop;
scoped_ptr<MockCommandBuffer> command_buffer_;
scoped_ptr<base::SharedMemory> shared_memory_;