Move scoped_nsdisable_screen_update from base to app/mac...

chrome/browser/cocoa/html_dialog_window_controller_unittest.mm

-// 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.
 
 #import "chrome/browser/cocoa/html_dialog_window_controller.h"
 
 #include <string>
 #include <vector>
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/scoped_nsautorelease_pool.h"
+#import "base/mac/scoped_nsautorelease_pool.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/testing_profile.h"
 #include "gfx/size.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 40 matching lines @@
 // TODO(akalin): We can't test much more than the below without a real browser.
 // In particular, GetDOMMessageHandlers() and GetDialogArgs() are never called.
 // This should be fixed.
 
 TEST_F(HtmlDialogWindowControllerTest, showDialog) {
   // We want to make sure html_dialog_window_controller below gets
   // destroyed before delegate_, so we specify our own autorelease pool.
   //
   // TODO(dmaclach): Remove this once
   // http://code.google.com/p/chromium/issues/detail?id=26133 is fixed.
-  base::ScopedNSAutoreleasePool release_pool;
+  base::mac::ScopedNSAutoreleasePool release_pool;
 
   EXPECT_CALL(delegate_, GetDialogTitle())
     .WillOnce(Return(title_));
   EXPECT_CALL(delegate_, GetDialogSize(_))
     .WillOnce(SetArgumentPointee<0>(size_));
   EXPECT_CALL(delegate_, GetDialogContentURL())
     .WillOnce(Return(gurl_));
   EXPECT_CALL(delegate_, OnDialogClosed(_))
     .Times(1);
 
   HtmlDialogWindowController* html_dialog_window_controller =
     [[HtmlDialogWindowController alloc] initWithDelegate:&delegate_
                                                  profile:profile()];
 
   [html_dialog_window_controller loadDialogContents];
   [html_dialog_window_controller showWindow:nil];
   [html_dialog_window_controller close];
 }
 
 }  // namespace