Move scoped_nsdisable_screen_update from base to app/mac...

chrome/browser/cocoa/cocoa_test_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_
 #define CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/chrome_application_mac.h"
 #include "base/debug_util.h"
 #include "base/mac_util.h"
 #include "base/path_service.h"
-#import "base/scoped_nsautorelease_pool.h"
+#import "base/mac/scoped_nsautorelease_pool.h"
 #import "base/scoped_nsobject.h"
 #include "chrome/common/chrome_constants.h"
 #include "testing/platform_test.h"
 
 // Background windows normally will not display things such as focus
 // rings.  This class allows -isKeyWindow to be manipulated to test
 // such things.
 @interface CocoaTestHelperWindow : NSWindow {
  @private
   BOOL pretendIsKeyWindow_;
@@ skipping 57 matching lines @@
   // contents aren't retained, the pointer values can only be used for
   // comparison purposes.  Using std::set to make progress-checking
   // convenient.
   static std::set<NSWindow*> ApplicationWindows();
 
   // Return a set of windows which are in |ApplicationWindows()| but
   // not |initial_windows_|.
   std::set<NSWindow*> WindowsLeft();
 
   bool called_tear_down_;
-  base::ScopedNSAutoreleasePool pool_;
+  base::mac::ScopedNSAutoreleasePool pool_;
 
   // Windows which existed at the beginning of the test.
   std::set<NSWindow*> initial_windows_;
 
   // Strong. Lazily created. This isn't wrapped in a scoped_nsobject because
   // we want to call [close] to destroy it rather than calling [release]. We
   // want to verify that [close] is actually removing our window and that it's
   // not hanging around because releaseWhenClosed was set to "no" on the window.
   // It isn't wrapped in a different wrapper class to close it because we
   // need to close it at a very specific time; just before we enter our clean
@@ skipping 40 matching lines @@
 #define EXPECT_NSRECT_EQ(expected, actual) \
     EXPECT_TRUE(CGFLOAT_EQ(expected.origin.x, actual.origin.x) && \
                 CGFLOAT_EQ(expected.origin.y, actual.origin.y) && \
                 CGFLOAT_EQ(expected.size.width, actual.size.width) && \
                 CGFLOAT_EQ(expected.size.height, actual.size.height)) << \
                 "Rects do not match: " << \
                 [NSStringFromRect(expected) UTF8String] << \
                 " != " << [NSStringFromRect(actual) UTF8String]
 
 #endif  // CHROME_BROWSER_COCOA_COCOA_TEST_HELPER_H_