summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer/importer_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/importer/importer_unittest.cc')
-rw-r--r--chrome/browser/importer/importer_unittest.cc28
1 files changed, 8 insertions, 20 deletions
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index d99b1e9..879d7cb 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -120,15 +120,9 @@ class ImporterTest : public testing::Test {
int items = HISTORY | PASSWORDS | FAVORITES;
if (import_search_plugins)
items = items | SEARCH_ENGINES;
- loop->PostTask(
- FROM_HERE,
- NewRunnableMethod(host.get(),
- &ImporterHost::StartImportSettings,
- profile_info,
- static_cast<Profile*>(NULL),
- items,
- make_scoped_refptr(writer),
- true));
+ loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
+ &ImporterHost::StartImportSettings, profile_info,
+ static_cast<Profile*>(NULL), items, writer, true));
loop->Run();
}
@@ -704,23 +698,17 @@ TEST_F(ImporterTest, MAYBE(Firefox2Importer)) {
MessageLoop* loop = MessageLoop::current();
scoped_refptr<ImporterHost> host = new ImporterHost();
- scoped_refptr<FirefoxObserver> observer = new FirefoxObserver();
+ FirefoxObserver* observer = new FirefoxObserver();
host->SetObserver(observer);
ProfileInfo profile_info;
profile_info.browser_type = FIREFOX2;
profile_info.app_path = app_path_;
profile_info.source_path = profile_path_;
- loop->PostTask(
- FROM_HERE,
- NewRunnableMethod(
- host.get(),
- &ImporterHost::StartImportSettings,
- profile_info,
- static_cast<Profile*>(NULL),
- HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES,
- observer,
- true));
+ loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
+ &ImporterHost::StartImportSettings, profile_info,
+ static_cast<Profile*>(NULL),
+ HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true));
loop->Run();
}