Move scoped_nsdisable_screen_update from base to app/mac...

chrome/browser/cocoa/keyword_editor_cocoa_controller_unittest.mm

 // Copyright (c) 2009 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/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 48 matching lines @@
     // window's delegate so that the controller can clean itself up in
     // |-windowWillClose:|.
     ASSERT_TRUE([controller_ window]);
 
     [controller_ close];
     CocoaTest::TearDown();
   }
 
   // Helper to count the keyword editors.
   NSUInteger CountKeywordEditors() {
-    base::ScopedNSAutoreleasePool pool;
+    base::mac::ScopedNSAutoreleasePool pool;
     NSUInteger count = 0;
     for (NSWindow* window in [NSApp windows]) {
       id controller = [window windowController];
       if ([controller isKindOfClass:[KeywordEditorCocoaController class]]) {
         ++count;
       }
     }
     return count;
   }
 
@@ skipping 16 matching lines @@
   KeywordEditorCocoaController* sharedInstance =
       [KeywordEditorCocoaController sharedInstanceForProfile:profile];
   EXPECT_TRUE(nil == sharedInstance);
   EXPECT_EQ(CountKeywordEditors(), 0U);
 
   const NSUInteger initial_window_count([[NSApp windows] count]);
 
   // The window unwinds using -autorelease, so we need to introduce an
   // autorelease pool to really test whether it went away or not.
   {
-    base::ScopedNSAutoreleasePool pool;
+    base::mac::ScopedNSAutoreleasePool pool;
 
     // +showKeywordEditor: creates a new controller.
     [KeywordEditorCocoaController showKeywordEditor:profile];
     sharedInstance =
         [KeywordEditorCocoaController sharedInstanceForProfile:profile];
     EXPECT_TRUE(sharedInstance);
     EXPECT_EQ(CountKeywordEditors(), 1U);
 
     // Another call doesn't create another controller.
     [KeywordEditorCocoaController showKeywordEditor:profile];
@@ skipping 96 matching lines @@
   ASSERT_TRUE([controller_ tableView:table isGroupRow:0]);
   ASSERT_FALSE([controller_ tableView:table isGroupRow:1]);
   ASSERT_FALSE([controller_ tableView:table isGroupRow:2]);
 
   ASSERT_FALSE([controller_ tableView:table shouldSelectRow:0]);
   ASSERT_TRUE([controller_ tableView:table shouldSelectRow:1]);
   ASSERT_TRUE([controller_ tableView:table shouldSelectRow:2]);
 }
 
 }  // namespace