| Index: extensions/browser/updater/safe_manifest_parser.cc
|
| diff --git a/chrome/browser/extensions/updater/safe_manifest_parser.cc b/extensions/browser/updater/safe_manifest_parser.cc
|
| similarity index 83%
|
| rename from chrome/browser/extensions/updater/safe_manifest_parser.cc
|
| rename to extensions/browser/updater/safe_manifest_parser.cc
|
| index a15a828fbf49130614e05d9f1d224c832f0c6609..2ab9a0571891a0444faeac99975366fc6c2bf54f 100644
|
| --- a/chrome/browser/extensions/updater/safe_manifest_parser.cc
|
| +++ b/extensions/browser/updater/safe_manifest_parser.cc
|
| @@ -2,16 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/extensions/updater/safe_manifest_parser.h"
|
| +#include "extensions/browser/updater/safe_manifest_parser.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| -#include "chrome/common/extensions/chrome_utility_extensions_messages.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/utility_process_host.h"
|
| #include "content/public/common/content_switches.h"
|
| +#include "extensions/common/extension_utility_messages.h"
|
| #include "ipc/ipc_message_macros.h"
|
|
|
| using content::BrowserThread;
|
| @@ -21,16 +21,15 @@ namespace extensions {
|
| SafeManifestParser::SafeManifestParser(const std::string& xml,
|
| ManifestFetchData* fetch_data,
|
| const UpdateCallback& update_callback)
|
| - : xml_(xml),
|
| - fetch_data_(fetch_data),
|
| - update_callback_(update_callback) {
|
| + : xml_(xml), fetch_data_(fetch_data), update_callback_(update_callback) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| }
|
|
|
| void SafeManifestParser::Start() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| if (!BrowserThread::PostTask(
|
| - BrowserThread::IO, FROM_HERE,
|
| + BrowserThread::IO,
|
| + FROM_HERE,
|
| base::Bind(&SafeManifestParser::ParseInSandbox, this))) {
|
| NOTREACHED();
|
| }
|
| @@ -47,15 +46,15 @@ void SafeManifestParser::ParseInSandbox() {
|
| content::UtilityProcessHost* host = content::UtilityProcessHost::Create(
|
| this,
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get());
|
| - host->Send(new ChromeUtilityMsg_ParseUpdateManifest(xml_));
|
| + host->Send(new ExtensionUtilityMsg_ParseUpdateManifest(xml_));
|
| }
|
|
|
| bool SafeManifestParser::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(SafeManifestParser, message)
|
| - IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseUpdateManifest_Succeeded,
|
| + IPC_MESSAGE_HANDLER(ExtensionUtilityHostMsg_ParseUpdateManifest_Succeeded,
|
| OnParseUpdateManifestSucceeded)
|
| - IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ParseUpdateManifest_Failed,
|
| + IPC_MESSAGE_HANDLER(ExtensionUtilityHostMsg_ParseUpdateManifest_Failed,
|
| OnParseUpdateManifestFailed)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
|
|