Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(935)

Side by Side Diff: chrome/browser/extensions/sandboxed_unpacker.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/browser/extensions/sandboxed_unpacker.h" 5 #include "chrome/browser/extensions/sandboxed_unpacker.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 10 matching lines...) Expand all
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/threading/sequenced_worker_pool.h" 22 #include "base/threading/sequenced_worker_pool.h"
23 #include "chrome/browser/extensions/extension_service.h" 23 #include "chrome/browser/extensions/extension_service.h"
24 #include "chrome/common/chrome_paths.h" 24 #include "chrome/common/chrome_paths.h"
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/chrome_utility_messages.h" 26 #include "chrome/common/chrome_utility_messages.h"
27 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" 27 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
28 #include "chrome/common/extensions/extension_file_util.h" 28 #include "chrome/common/extensions/extension_file_util.h"
29 #include "components/crx_file/constants.h" 29 #include "components/crx_file/constants.h"
30 #include "components/crx_file/crx_file.h" 30 #include "components/crx_file/crx_file.h"
31 #include "components/crx_file/id_util.h"
31 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
32 #include "content/public/browser/utility_process_host.h" 33 #include "content/public/browser/utility_process_host.h"
33 #include "content/public/common/common_param_traits.h" 34 #include "content/public/common/common_param_traits.h"
34 #include "crypto/signature_verifier.h" 35 #include "crypto/signature_verifier.h"
35 #include "extensions/common/constants.h" 36 #include "extensions/common/constants.h"
36 #include "extensions/common/extension.h" 37 #include "extensions/common/extension.h"
37 #include "extensions/common/extension_l10n_util.h" 38 #include "extensions/common/extension_l10n_util.h"
38 #include "extensions/common/file_util.h" 39 #include "extensions/common/file_util.h"
39 #include "extensions/common/id_util.h"
40 #include "extensions/common/manifest_constants.h" 40 #include "extensions/common/manifest_constants.h"
41 #include "extensions/common/manifest_handlers/icons_handler.h" 41 #include "extensions/common/manifest_handlers/icons_handler.h"
42 #include "grit/generated_resources.h" 42 #include "grit/generated_resources.h"
43 #include "third_party/skia/include/core/SkBitmap.h" 43 #include "third_party/skia/include/core/SkBitmap.h"
44 #include "ui/base/l10n/l10n_util.h" 44 #include "ui/base/l10n/l10n_util.h"
45 #include "ui/gfx/codec/png_codec.h" 45 #include "ui/gfx/codec/png_codec.h"
46 46
47 using base::ASCIIToUTF16; 47 using base::ASCIIToUTF16;
48 using content::BrowserThread; 48 using content::BrowserThread;
49 using content::UtilityProcessHost; 49 using content::UtilityProcessHost;
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 l10n_util::GetStringFUTF16( 572 l10n_util::GetStringFUTF16(
573 IDS_EXTENSION_PACKAGE_ERROR_CODE, 573 IDS_EXTENSION_PACKAGE_ERROR_CODE,
574 ASCIIToUTF16("CRX_SIGNATURE_VERIFICATION_FAILED"))); 574 ASCIIToUTF16("CRX_SIGNATURE_VERIFICATION_FAILED")));
575 return false; 575 return false;
576 } 576 }
577 577
578 std::string public_key = 578 std::string public_key =
579 std::string(reinterpret_cast<char*>(&key.front()), key.size()); 579 std::string(reinterpret_cast<char*>(&key.front()), key.size());
580 base::Base64Encode(public_key, &public_key_); 580 base::Base64Encode(public_key, &public_key_);
581 581
582 extension_id_ = id_util::GenerateId(public_key); 582 extension_id_ = crx_file::id_util::GenerateId(public_key);
583 583
584 return true; 584 return true;
585 } 585 }
586 586
587 void SandboxedUnpacker::ReportFailure(FailureReason reason, 587 void SandboxedUnpacker::ReportFailure(FailureReason reason,
588 const base::string16& error) { 588 const base::string16& error) {
589 UMA_HISTOGRAM_ENUMERATION("Extensions.SandboxUnpackFailureReason", 589 UMA_HISTOGRAM_ENUMERATION("Extensions.SandboxUnpackFailureReason",
590 reason, NUM_FAILURE_REASONS); 590 reason, NUM_FAILURE_REASONS);
591 UMA_HISTOGRAM_TIMES("Extensions.SandboxUnpackFailureTime", 591 UMA_HISTOGRAM_TIMES("Extensions.SandboxUnpackFailureTime",
592 base::TimeTicks::Now() - unpack_start_time_); 592 base::TimeTicks::Now() - unpack_start_time_);
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 830
831 void SandboxedUnpacker::Cleanup() { 831 void SandboxedUnpacker::Cleanup() {
832 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread()); 832 DCHECK(unpacker_io_task_runner_->RunsTasksOnCurrentThread());
833 if (!temp_dir_.Delete()) { 833 if (!temp_dir_.Delete()) {
834 LOG(WARNING) << "Can not delete temp directory at " 834 LOG(WARNING) << "Can not delete temp directory at "
835 << temp_dir_.path().value(); 835 << temp_dir_.path().value();
836 } 836 }
837 } 837 }
838 838
839 } // namespace extensions 839 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/policy_handlers.cc ('k') | chrome/browser/extensions/shared_module_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698