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

Side by Side Diff: chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc

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
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h" 5 #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 message_loop_.RunUntilIdle(); 77 message_loop_.RunUntilIdle();
78 } 78 }
79 79
80 BookmarkModel* RecentlyUsedFoldersComboModelTest::GetModel() { 80 BookmarkModel* RecentlyUsedFoldersComboModelTest::GetModel() {
81 return BookmarkModelFactory::GetForProfile(profile_.get()); 81 return BookmarkModelFactory::GetForProfile(profile_.get());
82 } 82 }
83 83
84 // Verifies there are no duplicate nodes in the model. 84 // Verifies there are no duplicate nodes in the model.
85 TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) { 85 TEST_F(RecentlyUsedFoldersComboModelTest, NoDups) {
86 const BookmarkNode* new_node = GetModel()->AddURL( 86 const BookmarkNode* new_node = GetModel()->AddURL(
87 GetModel()->bookmark_bar_node(), 0, ASCIIToUTF16("a"), 87 GetModel()->bookmark_bar_node(), 0, base::ASCIIToUTF16("a"),
88 GURL("http://a")); 88 GURL("http://a"));
89 RecentlyUsedFoldersComboModel model(GetModel(), new_node); 89 RecentlyUsedFoldersComboModel model(GetModel(), new_node);
90 std::set<base::string16> items; 90 std::set<base::string16> items;
91 for (int i = 0; i < model.GetItemCount(); ++i) { 91 for (int i = 0; i < model.GetItemCount(); ++i) {
92 if (!model.IsItemSeparatorAt(i)) 92 if (!model.IsItemSeparatorAt(i))
93 EXPECT_EQ(0u, items.count(model.GetItemAt(i))); 93 EXPECT_EQ(0u, items.count(model.GetItemAt(i)));
94 } 94 }
95 } 95 }
96 96
97 // Verifies that observers are notified on changes. 97 // Verifies that observers are notified on changes.
98 TEST_F(RecentlyUsedFoldersComboModelTest, NotifyObserver) { 98 TEST_F(RecentlyUsedFoldersComboModelTest, NotifyObserver) {
99 const BookmarkNode* folder = GetModel()->AddFolder( 99 const BookmarkNode* folder = GetModel()->AddFolder(
100 GetModel()->bookmark_bar_node(), 0, ASCIIToUTF16("a")); 100 GetModel()->bookmark_bar_node(), 0, base::ASCIIToUTF16("a"));
101 const BookmarkNode* sub_folder = GetModel()->AddFolder( 101 const BookmarkNode* sub_folder = GetModel()->AddFolder(
102 folder, 0, ASCIIToUTF16("b")); 102 folder, 0, base::ASCIIToUTF16("b"));
103 const BookmarkNode* new_node = GetModel()->AddURL( 103 const BookmarkNode* new_node = GetModel()->AddURL(
104 sub_folder, 0, ASCIIToUTF16("a"), GURL("http://a")); 104 sub_folder, 0, base::ASCIIToUTF16("a"), GURL("http://a"));
105 RecentlyUsedFoldersComboModel model(GetModel(), new_node); 105 RecentlyUsedFoldersComboModel model(GetModel(), new_node);
106 TestComboboxModelObserver observer; 106 TestComboboxModelObserver observer;
107 model.AddObserver(&observer); 107 model.AddObserver(&observer);
108 108
109 const int initial_count = model.GetItemCount(); 109 const int initial_count = model.GetItemCount();
110 // Remove a folder, it should remove an item from the model too. 110 // Remove a folder, it should remove an item from the model too.
111 GetModel()->Remove(folder, folder->GetIndexOf(sub_folder)); 111 GetModel()->Remove(folder, folder->GetIndexOf(sub_folder));
112 EXPECT_TRUE(observer.GetAndClearChanged()); 112 EXPECT_TRUE(observer.GetAndClearChanged());
113 const int updated_count = model.GetItemCount(); 113 const int updated_count = model.GetItemCount();
114 EXPECT_LT(updated_count, initial_count); 114 EXPECT_LT(updated_count, initial_count);
115 115
116 // Remove all, which should remove a folder too. 116 // Remove all, which should remove a folder too.
117 GetModel()->RemoveAll(); 117 GetModel()->RemoveAll();
118 EXPECT_TRUE(observer.GetAndClearChanged()); 118 EXPECT_TRUE(observer.GetAndClearChanged());
119 EXPECT_LT(model.GetItemCount(), updated_count); 119 EXPECT_LT(model.GetItemCount(), updated_count);
120 120
121 model.RemoveObserver(&observer); 121 model.RemoveObserver(&observer);
122 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698