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

Side by Side Diff: chrome/browser/autocomplete/shortcuts_backend_unittest.cc

Issue 655413002: Convert ARRAYSIZE_UNSAFE -> arraysize in chrome/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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/autocomplete/shortcuts_backend.h" 5 #include "chrome/browser/autocomplete/shortcuts_backend.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_INFINITE, 196 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_INFINITE,
197 "", "", AutocompleteMatchType::SEARCH_HISTORY }, 197 "", "", AutocompleteMatchType::SEARCH_HISTORY },
198 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED, 198 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_PERSONALIZED,
199 "", "", AutocompleteMatchType::SEARCH_HISTORY }, 199 "", "", AutocompleteMatchType::SEARCH_HISTORY },
200 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_PROFILE, 200 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_PROFILE,
201 "", "", AutocompleteMatchType::SEARCH_HISTORY }, 201 "", "", AutocompleteMatchType::SEARCH_HISTORY },
202 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_ANSWER, 202 { "0,1", "0,0", AutocompleteMatchType::SEARCH_SUGGEST_ANSWER,
203 "", "", AutocompleteMatchType::SEARCH_HISTORY }, 203 "", "", AutocompleteMatchType::SEARCH_HISTORY },
204 }; 204 };
205 205
206 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { 206 for (size_t i = 0; i < arraysize(cases); ++i) {
207 history::ShortcutsDatabase::Shortcut::MatchCore match_core( 207 history::ShortcutsDatabase::Shortcut::MatchCore match_core(
208 MatchCoreForTesting(std::string(), cases[i].input_contents_class, 208 MatchCoreForTesting(std::string(), cases[i].input_contents_class,
209 cases[i].input_description_class, 209 cases[i].input_description_class,
210 cases[i].input_type)); 210 cases[i].input_type));
211 EXPECT_EQ(cases[i].output_contents_class, match_core.contents_class) 211 EXPECT_EQ(cases[i].output_contents_class, match_core.contents_class)
212 << ":i:" << i << ":type:" << cases[i].input_type; 212 << ":i:" << i << ":type:" << cases[i].input_type;
213 EXPECT_EQ(cases[i].output_description_class, match_core.description_class) 213 EXPECT_EQ(cases[i].output_description_class, match_core.description_class)
214 << ":i:" << i << ":type:" << cases[i].input_type; 214 << ":i:" << i << ":type:" << cases[i].input_type;
215 EXPECT_EQ(cases[i].output_type, match_core.type) 215 EXPECT_EQ(cases[i].output_type, match_core.type)
216 << ":i:" << i << ":type:" << cases[i].input_type; 216 << ":i:" << i << ":type:" << cases[i].input_type;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 ASSERT_TRUE(shortcut4_iter != shortcuts_map().end()); 313 ASSERT_TRUE(shortcut4_iter != shortcuts_map().end());
314 EXPECT_EQ(shortcut4.id, shortcut4_iter->second.id); 314 EXPECT_EQ(shortcut4.id, shortcut4_iter->second.id);
315 315
316 history::ShortcutsDatabase::ShortcutIDs deleted_ids; 316 history::ShortcutsDatabase::ShortcutIDs deleted_ids;
317 deleted_ids.push_back(shortcut3.id); 317 deleted_ids.push_back(shortcut3.id);
318 deleted_ids.push_back(shortcut4.id); 318 deleted_ids.push_back(shortcut4.id);
319 EXPECT_TRUE(DeleteShortcutsWithIDs(deleted_ids)); 319 EXPECT_TRUE(DeleteShortcutsWithIDs(deleted_ids));
320 320
321 ASSERT_EQ(0U, shortcuts_map().size()); 321 ASSERT_EQ(0U, shortcuts_map().size());
322 } 322 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/browser_about_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698