summaryrefslogtreecommitdiffstats
path: root/base/shared_memory_unittest.cc
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 /base/shared_memory_unittest.cc
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 'base/shared_memory_unittest.cc')
-rw-r--r--base/shared_memory_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/shared_memory_unittest.cc b/base/shared_memory_unittest.cc
index 97287fa..53bffb4 100644
--- a/base/shared_memory_unittest.cc
+++ b/base/shared_memory_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2006-2008 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/basictypes.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/platform_thread.h"
-#include "base/scoped_nsautorelease_pool.h"
#include "base/shared_memory.h"
#include "base/scoped_ptr.h"
#include "base/test/multiprocess_test.h"
@@ -33,7 +33,7 @@ class MultipleThreadMain : public PlatformThread::Delegate {
// PlatformThread::Delegate interface.
void ThreadMain() {
- ScopedNSAutoreleasePool pool; // noop if not OSX
+ mac::ScopedNSAutoreleasePool pool; // noop if not OSX
const uint32 kDataSize = 1024;
SharedMemory memory;
bool rv = memory.Create(s_test_name_, false, true, kDataSize);
@@ -286,7 +286,7 @@ class SharedMemoryProcessTest : public base::MultiProcessTest {
static int TaskTestMain() {
int errors = 0;
- ScopedNSAutoreleasePool pool; // noop if not OSX
+ mac::ScopedNSAutoreleasePool pool; // noop if not OSX
const uint32 kDataSize = 1024;
SharedMemory memory;
bool rv = memory.Create(s_test_name_, false, true, kDataSize);