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

Side by Side Diff: chrome/browser/importer/ie_importer_browsertest_win.cc

Issue 2305813002: Remove ScopedVector from importer. (Closed)
Patch Set: rebase 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 // The order of these includes is important. 5 // The order of these includes is important.
6 #include <windows.h> 6 #include <windows.h>
7 #include <unknwn.h> 7 #include <unknwn.h>
8 #include <intshcut.h> 8 #include <intshcut.h>
9 #include <propvarutil.h> 9 #include <propvarutil.h>
10 #include <shlguid.h> 10 #include <shlguid.h>
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 EXPECT_EQ(arraysize(kIESortedBookmarks), bookmark_count_); 395 EXPECT_EQ(arraysize(kIESortedBookmarks), bookmark_count_);
396 } 396 }
397 397
398 // ProfileWriter: 398 // ProfileWriter:
399 bool BookmarkModelIsLoaded() const override { return true; } 399 bool BookmarkModelIsLoaded() const override { return true; }
400 bool TemplateURLServiceIsLoaded() const override { return true; } 400 bool TemplateURLServiceIsLoaded() const override { return true; }
401 401
402 void AddPasswordForm(const autofill::PasswordForm& form) override {} 402 void AddPasswordForm(const autofill::PasswordForm& form) override {}
403 void AddHistoryPage(const history::URLRows& page, 403 void AddHistoryPage(const history::URLRows& page,
404 history::VisitSource visit_source) override {} 404 history::VisitSource visit_source) override {}
405 void AddKeywords(ScopedVector<TemplateURL> template_urls, 405 void AddKeywords(TemplateURLService::OwnedTemplateURLVector template_urls,
406 bool unique_on_host_and_path) override {} 406 bool unique_on_host_and_path) override {}
407 void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks, 407 void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks,
408 const base::string16& top_level_folder_name) override { 408 const base::string16& top_level_folder_name) override {
409 ASSERT_LE(bookmark_count_ + bookmarks.size(), 409 ASSERT_LE(bookmark_count_ + bookmarks.size(),
410 arraysize(kIESortedBookmarks)); 410 arraysize(kIESortedBookmarks));
411 for (size_t i = 0; i < bookmarks.size(); ++i) { 411 for (size_t i = 0; i < bookmarks.size(); ++i) {
412 EXPECT_NO_FATAL_FAILURE( 412 EXPECT_NO_FATAL_FAILURE(
413 TestEqualBookmarkEntry(bookmarks[i], 413 TestEqualBookmarkEntry(bookmarks[i],
414 kIESortedBookmarks[bookmark_count_])) << i; 414 kIESortedBookmarks[bookmark_count_])) << i;
415 ++bookmark_count_; 415 ++bookmark_count_;
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 source_profile.source_path = temp_dir_.path(); 649 source_profile.source_path = temp_dir_.path();
650 650
651 host->StartImportSettings( 651 host->StartImportSettings(
652 source_profile, 652 source_profile,
653 browser()->profile(), 653 browser()->profile(),
654 importer::HOME_PAGE, 654 importer::HOME_PAGE,
655 observer); 655 observer);
656 base::RunLoop().Run(); 656 base::RunLoop().Run();
657 } 657 }
658 658
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698