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

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

Issue 2792383003: Rename ScopedComPtr::Release() to ScopedComPtr::Reset() (Closed)
Patch Set: Fix New Callers Created 3 years, 8 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 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 host->StartImportSettings( 512 host->StartImportSettings(
513 source_profile, 513 source_profile,
514 browser()->profile(), 514 browser()->profile(),
515 importer::HISTORY | importer::PASSWORDS | importer::FAVORITES, 515 importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
516 observer); 516 observer);
517 base::RunLoop().Run(); 517 base::RunLoop().Run();
518 518
519 // Cleans up. 519 // Cleans up.
520 url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0); 520 url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0);
521 url_history_stg2->DeleteUrl(kIECacheItemUrl, 0); 521 url_history_stg2->DeleteUrl(kIECacheItemUrl, 0);
522 url_history_stg2.Release(); 522 url_history_stg2.Reset();
523 } 523 }
524 524
525 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, 525 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest,
526 IEImporterMalformedFavoritesRegistry) { 526 IEImporterMalformedFavoritesRegistry) {
527 // Sets up a favorites folder. 527 // Sets up a favorites folder.
528 base::FilePath path = temp_dir_.GetPath().AppendASCII("Favorites"); 528 base::FilePath path = temp_dir_.GetPath().AppendASCII("Favorites");
529 CreateDirectory(path.value().c_str(), NULL); 529 CreateDirectory(path.value().c_str(), NULL);
530 CreateDirectory(path.AppendASCII("b").value().c_str(), NULL); 530 CreateDirectory(path.AppendASCII("b").value().c_str(), NULL);
531 ASSERT_TRUE(CreateUrlFile(path.AppendASCII("a.url"), 531 ASSERT_TRUE(CreateUrlFile(path.AppendASCII("a.url"),
532 L"http://www.google.com/0")); 532 L"http://www.google.com/0"));
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 source_profile.source_path = temp_dir_.GetPath(); 641 source_profile.source_path = temp_dir_.GetPath();
642 642
643 host->StartImportSettings( 643 host->StartImportSettings(
644 source_profile, 644 source_profile,
645 browser()->profile(), 645 browser()->profile(),
646 importer::HOME_PAGE, 646 importer::HOME_PAGE,
647 observer); 647 observer);
648 base::RunLoop().Run(); 648 base::RunLoop().Run();
649 } 649 }
650 650
OLDNEW
« no previous file with comments | « chrome/browser/google/google_update_win.cc ('k') | chrome/browser/media_galleries/win/snapshot_file_details.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698