Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 20 matching lines...) Expand all
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 #import "testing/gtest_mac.h" 32 #import "testing/gtest_mac.h"
33 #include "testing/platform_test.h" 33 #include "testing/platform_test.h"
34 #import "third_party/ocmock/OCMock/OCMock.h" 34 #import "third_party/ocmock/OCMock/OCMock.h"
35 #include "third_party/ocmock/gtest_support.h" 35 #include "third_party/ocmock/gtest_support.h"
36 #include "ui/base/cocoa/animation_utils.h" 36 #include "ui/base/cocoa/animation_utils.h"
37 #include "ui/base/test/cocoa_test_event_utils.h" 37 #include "ui/base/test/cocoa_test_event_utils.h"
38 #include "ui/base/theme_provider.h" 38 #include "ui/base/theme_provider.h"
39 #include "ui/gfx/image/image_skia.h" 39 #include "ui/gfx/image/image_skia.h"
40 40
41 using base::ASCIIToUTF16;
42
41 // Unit tests don't need time-consuming asynchronous animations. 43 // Unit tests don't need time-consuming asynchronous animations.
42 @interface BookmarkBarControllerTestable : BookmarkBarController { 44 @interface BookmarkBarControllerTestable : BookmarkBarController {
43 } 45 }
44 46
45 @end 47 @end
46 48
47 @implementation BookmarkBarControllerTestable 49 @implementation BookmarkBarControllerTestable
48 50
49 - (id)initWithBrowser:(Browser*)browser 51 - (id)initWithBrowser:(Browser*)browser
50 initialWidth:(CGFloat)initialWidth 52 initialWidth:(CGFloat)initialWidth
(...skipping 2018 matching lines...) Expand 10 before | Expand all | Expand 10 after
2069 "2f3b ] 4b "); 2071 "2f3b ] 4b ");
2070 actual = test::ModelStringFromNode(root); 2072 actual = test::ModelStringFromNode(root);
2071 EXPECT_EQ(expected, actual); 2073 EXPECT_EQ(expected, actual);
2072 2074
2073 // Verify that the other bookmark folder can't be deleted. 2075 // Verify that the other bookmark folder can't be deleted.
2074 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2076 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2075 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2077 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2076 } 2078 }
2077 2079
2078 } // namespace 2080 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698