Index: chrome/browser/importer/importer_unittest.cc |
=================================================================== |
--- chrome/browser/importer/importer_unittest.cc (revision 62042) |
+++ chrome/browser/importer/importer_unittest.cc (working copy) |
@@ -120,15 +120,9 @@ |
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 @@ |
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(); |
} |