Index: chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm |
index 651d0c05a9d8f3a43d125cdb063899105ce729ad..12c81992db894e208c3a9f38fbec6fedef7e9de7 100644 |
--- a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm |
+++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm |
@@ -5,15 +5,15 @@ |
#import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h" |
#include "base/mac/foundation_util.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/ui/autofill/autofill_dialog_models.h" |
#include "chrome/browser/ui/autofill/mock_autofill_dialog_controller.h" |
#import "chrome/browser/ui/cocoa/autofill/layout_view.h" |
#import "chrome/browser/ui/cocoa/menu_button.h" |
#include "grit/generated_resources.h" |
-#include "testing/gtest_mac.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "testing/gtest_mac.h" |
#include "testing/platform_test.h" |
#include "ui/base/models/combobox_model.h" |
#include "ui/base/models/simple_menu_model.h" |
@@ -41,7 +41,7 @@ class AutofillSectionContainerTest : public ui::CocoaTest { |
} |
protected: |
- scoped_nsobject<AutofillSectionContainer> container_; |
+ base::scoped_nsobject<AutofillSectionContainer> container_; |
testing::NiceMock<autofill::MockAutofillDialogController> controller_; |
}; |
@@ -163,4 +163,4 @@ TEST_F(AutofillSectionContainerTest, SuggestionsPopulatedByController) { |
EXPECT_NSEQ(@"a", [[menu itemAtIndex:1] title]); |
EXPECT_NSEQ(@"b", [[menu itemAtIndex:2] title]); |
-} |
+} |