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

chrome/profile_import/profile_import_thread.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 "chrome/profile_import/profile_import_thread.h"
 
 #include <algorithm>
 
 #include "base/values.h"
 #include "chrome/browser/importer/importer.h"
@@ skipping 14 matching lines @@
 }
 
 ProfileImportThread::ProfileImportThread()
     : bridge_(NULL),
       browser_type_(0),
       items_to_import_(0),
       importer_(NULL) {
   ChildProcess::current()->AddRefProcess();  // Balanced in Cleanup().
 }
 
-ProfileImportThread::~ProfileImportThread() {}
-
 void ProfileImportThread::OnControlMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(ProfileImportThread, msg)
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_StartImport,
                         OnImportStart)
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_CancelImport,
                         OnImportCancel)
     IPC_MESSAGE_HANDLER(ProfileImportProcessMsg_ReportImportItemFinished,
                         OnImportItemFinished)
   IPC_END_MESSAGE_MAP()
 }
 
 void ProfileImportThread::OnImportStart(
     const ProfileInfo& profile_info,
     int items,
     const DictionaryValue& localized_strings,
     bool import_to_bookmark_bar) {
   bridge_ = new ExternalProcessImporterBridge(this, localized_strings);
+  bridge_->AddRef();  // Balanced in Cleanup().
 
   ImporterList importer_list;
   importer_ = importer_list.CreateImporterByType(profile_info.browser_type);
   if (!importer_) {
     Send(new ProfileImportProcessHostMsg_Import_Finished(false,
         "Importer could not be created."));
     return;
   }
 
+  importer_->AddRef();  // Balanced in Cleanup().
   importer_->set_import_to_bookmark_bar(import_to_bookmark_bar);
   items_to_import_ = items;
 
   // Create worker thread in which importer runs.
   import_thread_.reset(new base::Thread("import_thread"));
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
   if (!import_thread_->StartWithOptions(options)) {
     NOTREACHED();
     Cleanup();
   }
-  import_thread_->message_loop()->PostTask(
-      FROM_HERE,
-      NewRunnableMethod(
-          importer_.get(),
-          &Importer::StartImport,
-          profile_info,
-          items,
-          bridge_));
+  import_thread_->message_loop()->PostTask(FROM_HERE,
+      NewRunnableMethod(importer_, &Importer::StartImport,
+          profile_info, items, bridge_));
 }
 
 void ProfileImportThread::OnImportCancel() {
   Cleanup();
 }
 
 void ProfileImportThread::OnImportItemFinished(uint16 item) {
   items_to_import_ ^= item;  // Remove finished item from mask.
   // If we've finished with all items, notify the browser process.
   if (items_to_import_ == 0)
@@ skipping 90 matching lines @@
   std::vector<TemplateURL> urls;
   for (size_t i = 0; i < template_urls.size(); ++i) {
     urls.push_back(*template_urls[i]);
   }
   Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(urls,
       default_keyword_index, unique_on_host_and_path));
 }
 
 void ProfileImportThread::Cleanup() {
   importer_->Cancel();
-  importer_ = NULL;
-  bridge_ = NULL;
+  importer_->Release();
+  bridge_->Release();
   ChildProcess::current()->ReleaseProcess();
 }