Move scoped_nsdisable_screen_update from base to app/mac...

gpu/command_buffer/client/ring_buffer_test.cc

 // 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.
 
 // This file contains the tests for the RingBuffer class.
 
 #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"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/gpu_processor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 
 using testing::Return;
@@ skipping 39 matching lines @@
     api_mock_->set_engine(gpu_processor_.get());
 
     helper_.reset(new CommandBufferHelper(command_buffer_.get()));
     helper_->Initialize(kBufferSize);
   }
 
   int32 GetToken() {
     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_;
   scoped_ptr<GPUProcessor> gpu_processor_;
   CommandParser* parser_;
   scoped_ptr<CommandBufferHelper> helper_;
 };
 
 #ifndef _MSC_VER
 const unsigned int BaseRingBufferTest::kBaseOffset;
@@ skipping 171 matching lines @@
   void* pointer1 = allocator_->Alloc(kSize);
   EXPECT_EQ(buffer_start_, static_cast<int8*>(pointer1));
 
   // Check that the token has indeed passed.
   EXPECT_LE(tokens[0], GetToken());
 
   allocator_->FreePendingToken(pointer1, helper_->InsertToken());
 }
 
 }  // namespace gpu