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

Side by Side Diff: chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc

Issue 2290503003: Remove use of stl_util in search_engines. (Closed)
Patch Set: fix broken test Created 4 years, 3 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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/memory/ptr_util.h"
6 #include "base/strings/string16.h" 7 #include "base/strings/string16.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search_engines/template_url_service_factory_test_util.h " 10 #include "chrome/browser/search_engines/template_url_service_factory_test_util.h "
10 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" 11 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
11 #include "chrome/browser/ui/search_engines/template_url_table_model.h" 12 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
12 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
13 #include "components/search_engines/template_url.h" 14 #include "components/search_engines/template_url.h"
14 #include "components/search_engines/template_url_service.h" 15 #include "components/search_engines/template_url_service.h"
15 #include "components/syncable_prefs/testing_pref_service_syncable.h" 16 #include "components/syncable_prefs/testing_pref_service_syncable.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 } 238 }
238 239
239 // Mutates the TemplateURLService and make sure table model is updating 240 // Mutates the TemplateURLService and make sure table model is updating
240 // appropriately. 241 // appropriately.
241 TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) { 242 TEST_F(KeywordEditorControllerTest, MutateTemplateURLService) {
242 int original_row_count = table_model()->RowCount(); 243 int original_row_count = table_model()->RowCount();
243 244
244 TemplateURLData data; 245 TemplateURLData data;
245 data.SetShortName(ASCIIToUTF16("b")); 246 data.SetShortName(ASCIIToUTF16("b"));
246 data.SetKeyword(ASCIIToUTF16("a")); 247 data.SetKeyword(ASCIIToUTF16("a"));
247 TemplateURL* turl = new TemplateURL(data); 248 TemplateURL* turl = util()->model()->Add(base::MakeUnique<TemplateURL>(data));
248 util()->model()->Add(turl);
249 249
250 // Table model should have updated. 250 // Table model should have updated.
251 VerifyChangeCount(1, 0, 0, 0); 251 VerifyChangeCount(1, 0, 0, 0);
252 252
253 // And should contain the newly added TemplateURL. 253 // And should contain the newly added TemplateURL.
254 ASSERT_EQ(original_row_count + 1, table_model()->RowCount()); 254 ASSERT_EQ(original_row_count + 1, table_model()->RowCount());
255 ASSERT_GE(table_model()->IndexOfTemplateURL(turl), 0); 255 ASSERT_GE(table_model()->IndexOfTemplateURL(turl), 0);
256 } 256 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698