OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/utility/profile_import_handler.h" | 5 #include "chrome/utility/profile_import_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/memory/ptr_util.h" |
9 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "base/threading/thread.h" | 12 #include "base/threading/thread.h" |
12 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "chrome/utility/importer/external_process_importer_bridge.h" | 15 #include "chrome/utility/importer/external_process_importer_bridge.h" |
15 #include "chrome/utility/importer/importer.h" | 16 #include "chrome/utility/importer/importer.h" |
16 #include "chrome/utility/importer/importer_creator.h" | 17 #include "chrome/utility/importer/importer_creator.h" |
17 #include "content/public/utility/utility_thread.h" | 18 #include "content/public/utility/utility_thread.h" |
18 #include "mojo/public/cpp/bindings/strong_binding.h" | 19 #include "mojo/public/cpp/bindings/strong_binding.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 } | 73 } |
73 } | 74 } |
74 | 75 |
75 void ProfileImportHandler::ImporterCleanup() { | 76 void ProfileImportHandler::ImporterCleanup() { |
76 importer_->Cancel(); | 77 importer_->Cancel(); |
77 importer_ = NULL; | 78 importer_ = NULL; |
78 bridge_ = NULL; | 79 bridge_ = NULL; |
79 import_thread_.reset(); | 80 import_thread_.reset(); |
80 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); | 81 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); |
81 } | 82 } |
OLD | NEW |