| Index: chrome/browser/ui/cocoa/run_loop_testing_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/run_loop_testing_unittest.mm b/chrome/browser/ui/cocoa/run_loop_testing_unittest.mm
|
| index d281c46fb08fa9fc50451f9919c73e6f7c986c03..760f9851e3ad8ae8e647c59efbbb33f49a028cc6 100644
|
| --- a/chrome/browser/ui/cocoa/run_loop_testing_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/run_loop_testing_unittest.mm
|
| @@ -6,7 +6,7 @@
|
|
|
| #import <Foundation/Foundation.h>
|
|
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @interface TestDelayed : NSObject {
|
| @@ -36,7 +36,7 @@
|
| @end
|
|
|
| TEST(RunLoopTesting, RunAllPending) {
|
| - scoped_nsobject<TestDelayed> tester([[TestDelayed alloc] init]);
|
| + base::scoped_nsobject<TestDelayed> tester([[TestDelayed alloc] init]);
|
| EXPECT_FALSE([tester didWork]);
|
|
|
| chrome::testing::NSRunLoopRunAllPending();
|
| @@ -45,8 +45,8 @@ TEST(RunLoopTesting, RunAllPending) {
|
| }
|
|
|
| TEST(RunLoopTesting, NestedWork) {
|
| - scoped_nsobject<TestDelayed> tester([[TestDelayed alloc] init]);
|
| - scoped_nsobject<TestDelayed> nested([[TestDelayed alloc] init]);
|
| + base::scoped_nsobject<TestDelayed> tester([[TestDelayed alloc] init]);
|
| + base::scoped_nsobject<TestDelayed> nested([[TestDelayed alloc] init]);
|
| [tester setNext:nested];
|
|
|
| EXPECT_FALSE([tester didWork]);
|
|
|