Revert 61899 for breaking cookes on file:// URLs....

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 102 matching lines @@
     MessageLoop* loop = MessageLoop::current();
     ProfileInfo profile_info;
     profile_info.browser_type = FIREFOX3;
     profile_info.app_path = app_path_;
     profile_info.source_path = profile_path_;
     scoped_refptr<ImporterHost> host = new ImporterHost();
     host->SetObserver(observer);
     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();
   }
 
   MessageLoopForUI message_loop_;
   ChromeThread ui_thread_;
   ChromeThread file_thread_;
   FilePath test_path_;
   FilePath profile_path_;
   FilePath app_path_;
 };
@@ skipping 555 matching lines @@
   data_path = data_path.AppendASCII("firefox2_searchplugins");
   if (!file_util::PathExists(data_path)) {
     // TODO(maruel):  Create test data that we can open source!
     LOG(ERROR) << L"Missing internal test data";
     return;
   }
   ASSERT_TRUE(file_util::CopyDirectory(data_path, search_engine_path, false));
 
   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();
 }
 
 static const BookmarkList kFirefox3Bookmarks[] = {
   {true, 0, {},
     L"Toolbar",
     "http://site/"},
   {false, 0, {},
     L"Title",
     "http://www.google.com/"},
@@ skipping 163 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer =
       new Firefox3Observer(import_search_engines);
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }