diff options
Diffstat (limited to 'chrome/browser/importer/importer_unittest.cc')
| -rw-r--r-- | chrome/browser/importer/importer_unittest.cc | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc index ebe23c8..e732365 100644 --- a/chrome/browser/importer/importer_unittest.cc +++ b/chrome/browser/importer/importer_unittest.cc @@ -158,18 +158,10 @@ class TestObserver : public ProfileWriter, return true; } - virtual void AddBookmarkModelObserver(BookmarkModelObserver* observer) { - NOTREACHED(); - } - virtual bool TemplateURLModelIsLoaded() const { return true; } - virtual void AddTemplateURLModelObserver(NotificationObserver* observer) { - NOTREACHED(); - } - virtual void AddPasswordForm(const PasswordForm& form) { // Importer should obtain this password form only. EXPECT_EQ(GURL("http://localhost:8080/security/index.htm"), form.origin); @@ -347,7 +339,8 @@ TEST_F(ImporterTest, IEImporter) { loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(), &ImporterHost::StartImportSettings, profile_info, - HISTORY | PASSWORDS | FAVORITES, observer, true)); + static_cast<Profile*>(NULL), HISTORY | PASSWORDS | FAVORITES, observer, + true)); loop->Run(); // Cleans up. @@ -513,18 +506,10 @@ class FirefoxObserver : public ProfileWriter, return true; } - virtual void AddBookmarkModelObserver(BookmarkModelObserver* observer) { - NOTREACHED(); - } - virtual bool TemplateURLModelIsLoaded() const { return true; } - virtual void AddTemplateURLModelObserver(NotificationObserver* observer) { - NOTREACHED(); - } - virtual void AddPasswordForm(const PasswordForm& form) { PasswordList p = kFirefox2Passwords[password_count_]; EXPECT_EQ(p.origin, form.origin.spec()); @@ -630,6 +615,7 @@ TEST_F(ImporterTest, Firefox2Importer) { loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(), &ImporterHost::StartImportSettings, profile_info, + static_cast<Profile*>(NULL), HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true)); loop->Run(); } @@ -710,18 +696,10 @@ class Firefox3Observer : public ProfileWriter, return true; } - virtual void AddBookmarkModelObserver(BookmarkModelObserver* observer) { - NOTREACHED(); - } - virtual bool TemplateURLModelIsLoaded() const { return true; } - virtual void AddTemplateURLModelObserver(NotificationObserver* observer) { - NOTREACHED(); - } - virtual void AddPasswordForm(const PasswordForm& form) { PasswordList p = kFirefox3Passwords[password_count_]; EXPECT_EQ(p.origin, form.origin.spec()); @@ -831,6 +809,7 @@ TEST_F(ImporterTest, Firefox3Importer) { host->SetObserver(observer); loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(), &ImporterHost::StartImportSettings, profile_info, + static_cast<Profile*>(NULL), HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true)); loop->Run(); } |