TBR: Fix dead tree.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18964 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 302 insertions, 377 deletions

diff --git a/base/crypto/rsa_private_key_unittest.cc b/base/crypto/rsa_private_key_unittest.cc
index 3b0d846..a2f57c5 100644
--- a/base/crypto/rsa_private_key_unittest.cc
+++ b/base/crypto/rsa_private_key_unittest.cc
@@ -49,110 +49,110 @@ TEST(RSAPrivateKeyUnitTest, InitRandomTest) {
 // with the openssl command line tool.
 TEST(RSAPrivateKeyUnitTest, PublicKeyTest) {
   const uint8 private_key_info[] = {
-    0x30, 0x82, 0x02, 0x78, 0x02, 0x01, 0x00, 0x30, 
-    0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 
-    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 
-    0x02, 0x62, 0x30, 0x82, 0x02, 0x5e, 0x02, 0x01, 
-    0x00, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b, 
-    0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61, 
-    0x99, 0x0d, 0x36, 0x0f, 0xd4, 0x66, 0x88, 0x08, 
-    0x55, 0x84, 0xd5, 0x3a, 0xbf, 0x2b, 0xa4, 0x64, 
-    0x85, 0x7b, 0x0c, 0x04, 0x13, 0x3f, 0x8d, 0xf4, 
-    0xbc, 0x38, 0x0d, 0x49, 0xfe, 0x6b, 0xc4, 0x5a, 
-    0xb0, 0x40, 0x53, 0x3a, 0xd7, 0x66, 0x09, 0x0f, 
-    0x9e, 0x36, 0x74, 0x30, 0xda, 0x8a, 0x31, 0x4f, 
-    0x1f, 0x14, 0x50, 0xd7, 0xc7, 0x20, 0x94, 0x17, 
-    0xde, 0x4e, 0xb9, 0x57, 0x5e, 0x7e, 0x0a, 0xe5, 
-    0xb2, 0x65, 0x7a, 0x89, 0x4e, 0xb6, 0x47, 0xff, 
-    0x1c, 0xbd, 0xb7, 0x38, 0x13, 0xaf, 0x47, 0x85, 
-    0x84, 0x32, 0x33, 0xf3, 0x17, 0x49, 0xbf, 0xe9, 
-    0x96, 0xd0, 0xd6, 0x14, 0x6f, 0x13, 0x8d, 0xc5, 
-    0xfc, 0x2c, 0x72, 0xba, 0xac, 0xea, 0x7e, 0x18, 
-    0x53, 0x56, 0xa6, 0x83, 0xa2, 0xce, 0x93, 0x93, 
-    0xe7, 0x1f, 0x0f, 0xe6, 0x0f, 0x02, 0x03, 0x01, 
-    0x00, 0x01, 0x02, 0x81, 0x80, 0x03, 0x61, 0x89, 
-    0x37, 0xcb, 0xf2, 0x98, 0xa0, 0xce, 0xb4, 0xcb, 
-    0x16, 0x13, 0xf0, 0xe6, 0xaf, 0x5c, 0xc5, 0xa7, 
-    0x69, 0x71, 0xca, 0xba, 0x8d, 0xe0, 0x4d, 0xdd, 
-    0xed, 0xb8, 0x48, 0x8b, 0x16, 0x93, 0x36, 0x95, 
-    0xc2, 0x91, 0x40, 0x65, 0x17, 0xbd, 0x7f, 0xd6, 
-    0xad, 0x9e, 0x30, 0x28, 0x46, 0xe4, 0x3e, 0xcc, 
-    0x43, 0x78, 0xf9, 0xfe, 0x1f, 0x33, 0x23, 0x1e, 
-    0x31, 0x12, 0x9d, 0x3c, 0xa7, 0x08, 0x82, 0x7b, 
-    0x7d, 0x25, 0x4e, 0x5e, 0x19, 0xa8, 0x9b, 0xed, 
-    0x86, 0xb2, 0xcb, 0x3c, 0xfe, 0x4e, 0xa1, 0xfa, 
-    0x62, 0x87, 0x3a, 0x17, 0xf7, 0x60, 0xec, 0x38, 
-    0x29, 0xe8, 0x4f, 0x34, 0x9f, 0x76, 0x9d, 0xee, 
-    0xa3, 0xf6, 0x85, 0x6b, 0x84, 0x43, 0xc9, 0x1e, 
-    0x01, 0xff, 0xfd, 0xd0, 0x29, 0x4c, 0xfa, 0x8e, 
-    0x57, 0x0c, 0xc0, 0x71, 0xa5, 0xbb, 0x88, 0x46, 
-    0x29, 0x5c, 0xc0, 0x4f, 0x01, 0x02, 0x41, 0x00, 
-    0xf5, 0x83, 0xa4, 0x64, 0x4a, 0xf2, 0xdd, 0x8c, 
-    0x2c, 0xed, 0xa8, 0xd5, 0x60, 0x5a, 0xe4, 0xc7, 
-    0xcc, 0x61, 0xcd, 0x38, 0x42, 0x20, 0xd3, 0x82, 
-    0x18, 0xf2, 0x35, 0x00, 0x72, 0x2d, 0xf7, 0x89, 
-    0x80, 0x67, 0xb5, 0x93, 0x05, 0x5f, 0xdd, 0x42, 
-    0xba, 0x16, 0x1a, 0xea, 0x15, 0xc6, 0xf0, 0xb8, 
-    0x8c, 0xbc, 0xbf, 0x54, 0x9e, 0xf1, 0xc1, 0xb2, 
-    0xb3, 0x8b, 0xb6, 0x26, 0x02, 0x30, 0xc4, 0x81, 
-    0x02, 0x41, 0x00, 0xc0, 0x60, 0x62, 0x80, 0xe1, 
-    0x22, 0x78, 0xf6, 0x9d, 0x83, 0x18, 0xeb, 0x72, 
-    0x45, 0xd7, 0xc8, 0x01, 0x7f, 0xa9, 0xca, 0x8f, 
-    0x7d, 0xd6, 0xb8, 0x31, 0x2b, 0x84, 0x7f, 0x62, 
-    0xd9, 0xa9, 0x22, 0x17, 0x7d, 0x06, 0x35, 0x6c, 
-    0xf3, 0xc1, 0x94, 0x17, 0x85, 0x5a, 0xaf, 0x9c, 
-    0x5c, 0x09, 0x3c, 0xcf, 0x2f, 0x44, 0x9d, 0xb6, 
-    0x52, 0x68, 0x5f, 0xf9, 0x59, 0xc8, 0x84, 0x2b, 
-    0x39, 0x22, 0x8f, 0x02, 0x41, 0x00, 0xb2, 0x04, 
-    0xe2, 0x0e, 0x56, 0xca, 0x03, 0x1a, 0xc0, 0xf9, 
-    0x12, 0x92, 0xa5, 0x6b, 0x42, 0xb8, 0x1c, 0xda, 
-    0x4d, 0x93, 0x9d, 0x5f, 0x6f, 0xfd, 0xc5, 0x58, 
-    0xda, 0x55, 0x98, 0x74, 0xfc, 0x28, 0x17, 0x93, 
-    0x1b, 0x75, 0x9f, 0x50, 0x03, 0x7f, 0x7e, 0xae, 
-    0xc8, 0x95, 0x33, 0x75, 0x2c, 0xd6, 0xa4, 0x35, 
-    0xb8, 0x06, 0x03, 0xba, 0x08, 0x59, 0x2b, 0x17, 
-    0x02, 0xdc, 0x4c, 0x7a, 0x50, 0x01, 0x02, 0x41, 
-    0x00, 0x9d, 0xdb, 0x39, 0x59, 0x09, 0xe4, 0x30, 
-    0xa0, 0x24, 0xf5, 0xdb, 0x2f, 0xf0, 0x2f, 0xf1, 
-    0x75, 0x74, 0x0d, 0x5e, 0xb5, 0x11, 0x73, 0xb0, 
-    0x0a, 0xaa, 0x86, 0x4c, 0x0d, 0xff, 0x7e, 0x1d, 
-    0xb4, 0x14, 0xd4, 0x09, 0x91, 0x33, 0x5a, 0xfd, 
-    0xa0, 0x58, 0x80, 0x9b, 0xbe, 0x78, 0x2e, 0x69, 
-    0x82, 0x15, 0x7c, 0x72, 0xf0, 0x7b, 0x18, 0x39, 
-    0xff, 0x6e, 0xeb, 0xc6, 0x86, 0xf5, 0xb4, 0xc7, 
-    0x6f, 0x02, 0x41, 0x00, 0x8d, 0x1a, 0x37, 0x0f, 
-    0x76, 0xc4, 0x82, 0xfa, 0x5c, 0xc3, 0x79, 0x35, 
-    0x3e, 0x70, 0x8a, 0xbf, 0x27, 0x49, 0xb0, 0x99, 
-    0x63, 0xcb, 0x77, 0x5f, 0xa8, 0x82, 0x65, 0xf6, 
-    0x03, 0x52, 0x51, 0xf1, 0xae, 0x2e, 0x05, 0xb3, 
-    0xc6, 0xa4, 0x92, 0xd1, 0xce, 0x6c, 0x72, 0xfb, 
-    0x21, 0xb3, 0x02, 0x87, 0xe4, 0xfd, 0x61, 0xca, 
-    0x00, 0x42, 0x19, 0xf0, 0xda, 0x5a, 0x53, 0xe3, 
+    0x30, 0x82, 0x02, 0x78, 0x02, 0x01, 0x00, 0x30, 

+    0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 

+    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 

+    0x02, 0x62, 0x30, 0x82, 0x02, 0x5e, 0x02, 0x01, 

+    0x00, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b, 

+    0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61, 

+    0x99, 0x0d, 0x36, 0x0f, 0xd4, 0x66, 0x88, 0x08, 

+    0x55, 0x84, 0xd5, 0x3a, 0xbf, 0x2b, 0xa4, 0x64, 

+    0x85, 0x7b, 0x0c, 0x04, 0x13, 0x3f, 0x8d, 0xf4, 

+    0xbc, 0x38, 0x0d, 0x49, 0xfe, 0x6b, 0xc4, 0x5a, 

+    0xb0, 0x40, 0x53, 0x3a, 0xd7, 0x66, 0x09, 0x0f, 

+    0x9e, 0x36, 0x74, 0x30, 0xda, 0x8a, 0x31, 0x4f, 

+    0x1f, 0x14, 0x50, 0xd7, 0xc7, 0x20, 0x94, 0x17, 

+    0xde, 0x4e, 0xb9, 0x57, 0x5e, 0x7e, 0x0a, 0xe5, 

+    0xb2, 0x65, 0x7a, 0x89, 0x4e, 0xb6, 0x47, 0xff, 

+    0x1c, 0xbd, 0xb7, 0x38, 0x13, 0xaf, 0x47, 0x85, 

+    0x84, 0x32, 0x33, 0xf3, 0x17, 0x49, 0xbf, 0xe9, 

+    0x96, 0xd0, 0xd6, 0x14, 0x6f, 0x13, 0x8d, 0xc5, 

+    0xfc, 0x2c, 0x72, 0xba, 0xac, 0xea, 0x7e, 0x18, 

+    0x53, 0x56, 0xa6, 0x83, 0xa2, 0xce, 0x93, 0x93, 

+    0xe7, 0x1f, 0x0f, 0xe6, 0x0f, 0x02, 0x03, 0x01, 

+    0x00, 0x01, 0x02, 0x81, 0x80, 0x03, 0x61, 0x89, 

+    0x37, 0xcb, 0xf2, 0x98, 0xa0, 0xce, 0xb4, 0xcb, 

+    0x16, 0x13, 0xf0, 0xe6, 0xaf, 0x5c, 0xc5, 0xa7, 

+    0x69, 0x71, 0xca, 0xba, 0x8d, 0xe0, 0x4d, 0xdd, 

+    0xed, 0xb8, 0x48, 0x8b, 0x16, 0x93, 0x36, 0x95, 

+    0xc2, 0x91, 0x40, 0x65, 0x17, 0xbd, 0x7f, 0xd6, 

+    0xad, 0x9e, 0x30, 0x28, 0x46, 0xe4, 0x3e, 0xcc, 

+    0x43, 0x78, 0xf9, 0xfe, 0x1f, 0x33, 0x23, 0x1e, 

+    0x31, 0x12, 0x9d, 0x3c, 0xa7, 0x08, 0x82, 0x7b, 

+    0x7d, 0x25, 0x4e, 0x5e, 0x19, 0xa8, 0x9b, 0xed, 

+    0x86, 0xb2, 0xcb, 0x3c, 0xfe, 0x4e, 0xa1, 0xfa, 

+    0x62, 0x87, 0x3a, 0x17, 0xf7, 0x60, 0xec, 0x38, 

+    0x29, 0xe8, 0x4f, 0x34, 0x9f, 0x76, 0x9d, 0xee, 

+    0xa3, 0xf6, 0x85, 0x6b, 0x84, 0x43, 0xc9, 0x1e, 

+    0x01, 0xff, 0xfd, 0xd0, 0x29, 0x4c, 0xfa, 0x8e, 

+    0x57, 0x0c, 0xc0, 0x71, 0xa5, 0xbb, 0x88, 0x46, 

+    0x29, 0x5c, 0xc0, 0x4f, 0x01, 0x02, 0x41, 0x00, 

+    0xf5, 0x83, 0xa4, 0x64, 0x4a, 0xf2, 0xdd, 0x8c, 

+    0x2c, 0xed, 0xa8, 0xd5, 0x60, 0x5a, 0xe4, 0xc7, 

+    0xcc, 0x61, 0xcd, 0x38, 0x42, 0x20, 0xd3, 0x82, 

+    0x18, 0xf2, 0x35, 0x00, 0x72, 0x2d, 0xf7, 0x89, 

+    0x80, 0x67, 0xb5, 0x93, 0x05, 0x5f, 0xdd, 0x42, 

+    0xba, 0x16, 0x1a, 0xea, 0x15, 0xc6, 0xf0, 0xb8, 

+    0x8c, 0xbc, 0xbf, 0x54, 0x9e, 0xf1, 0xc1, 0xb2, 

+    0xb3, 0x8b, 0xb6, 0x26, 0x02, 0x30, 0xc4, 0x81, 

+    0x02, 0x41, 0x00, 0xc0, 0x60, 0x62, 0x80, 0xe1, 

+    0x22, 0x78, 0xf6, 0x9d, 0x83, 0x18, 0xeb, 0x72, 

+    0x45, 0xd7, 0xc8, 0x01, 0x7f, 0xa9, 0xca, 0x8f, 

+    0x7d, 0xd6, 0xb8, 0x31, 0x2b, 0x84, 0x7f, 0x62, 

+    0xd9, 0xa9, 0x22, 0x17, 0x7d, 0x06, 0x35, 0x6c, 

+    0xf3, 0xc1, 0x94, 0x17, 0x85, 0x5a, 0xaf, 0x9c, 

+    0x5c, 0x09, 0x3c, 0xcf, 0x2f, 0x44, 0x9d, 0xb6, 

+    0x52, 0x68, 0x5f, 0xf9, 0x59, 0xc8, 0x84, 0x2b, 

+    0x39, 0x22, 0x8f, 0x02, 0x41, 0x00, 0xb2, 0x04, 

+    0xe2, 0x0e, 0x56, 0xca, 0x03, 0x1a, 0xc0, 0xf9, 

+    0x12, 0x92, 0xa5, 0x6b, 0x42, 0xb8, 0x1c, 0xda, 

+    0x4d, 0x93, 0x9d, 0x5f, 0x6f, 0xfd, 0xc5, 0x58, 

+    0xda, 0x55, 0x98, 0x74, 0xfc, 0x28, 0x17, 0x93, 

+    0x1b, 0x75, 0x9f, 0x50, 0x03, 0x7f, 0x7e, 0xae, 

+    0xc8, 0x95, 0x33, 0x75, 0x2c, 0xd6, 0xa4, 0x35, 

+    0xb8, 0x06, 0x03, 0xba, 0x08, 0x59, 0x2b, 0x17, 

+    0x02, 0xdc, 0x4c, 0x7a, 0x50, 0x01, 0x02, 0x41, 

+    0x00, 0x9d, 0xdb, 0x39, 0x59, 0x09, 0xe4, 0x30, 

+    0xa0, 0x24, 0xf5, 0xdb, 0x2f, 0xf0, 0x2f, 0xf1, 

+    0x75, 0x74, 0x0d, 0x5e, 0xb5, 0x11, 0x73, 0xb0, 

+    0x0a, 0xaa, 0x86, 0x4c, 0x0d, 0xff, 0x7e, 0x1d, 

+    0xb4, 0x14, 0xd4, 0x09, 0x91, 0x33, 0x5a, 0xfd, 

+    0xa0, 0x58, 0x80, 0x9b, 0xbe, 0x78, 0x2e, 0x69, 

+    0x82, 0x15, 0x7c, 0x72, 0xf0, 0x7b, 0x18, 0x39, 

+    0xff, 0x6e, 0xeb, 0xc6, 0x86, 0xf5, 0xb4, 0xc7, 

+    0x6f, 0x02, 0x41, 0x00, 0x8d, 0x1a, 0x37, 0x0f, 

+    0x76, 0xc4, 0x82, 0xfa, 0x5c, 0xc3, 0x79, 0x35, 

+    0x3e, 0x70, 0x8a, 0xbf, 0x27, 0x49, 0xb0, 0x99, 

+    0x63, 0xcb, 0x77, 0x5f, 0xa8, 0x82, 0x65, 0xf6, 

+    0x03, 0x52, 0x51, 0xf1, 0xae, 0x2e, 0x05, 0xb3, 

+    0xc6, 0xa4, 0x92, 0xd1, 0xce, 0x6c, 0x72, 0xfb, 

+    0x21, 0xb3, 0x02, 0x87, 0xe4, 0xfd, 0x61, 0xca, 

+    0x00, 0x42, 0x19, 0xf0, 0xda, 0x5a, 0x53, 0xe3, 

     0xb1, 0xc5, 0x15, 0xf3
   };
 
   const uint8 expected_public_key_info[] = {
-    0x30, 0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 
-    0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 
-    0x05, 0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81, 
-    0x89, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b, 
-    0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61, 
-    0x99, 0x0d, 0x36, 0x0f, 0xd4, 0x66, 0x88, 0x08, 
-    0x55, 0x84, 0xd5, 0x3a, 0xbf, 0x2b, 0xa4, 0x64, 
-    0x85, 0x7b, 0x0c, 0x04, 0x13, 0x3f, 0x8d, 0xf4, 
-    0xbc, 0x38, 0x0d, 0x49, 0xfe, 0x6b, 0xc4, 0x5a, 
-    0xb0, 0x40, 0x53, 0x3a, 0xd7, 0x66, 0x09, 0x0f, 
-    0x9e, 0x36, 0x74, 0x30, 0xda, 0x8a, 0x31, 0x4f, 
-    0x1f, 0x14, 0x50, 0xd7, 0xc7, 0x20, 0x94, 0x17, 
-    0xde, 0x4e, 0xb9, 0x57, 0x5e, 0x7e, 0x0a, 0xe5, 
-    0xb2, 0x65, 0x7a, 0x89, 0x4e, 0xb6, 0x47, 0xff, 
-    0x1c, 0xbd, 0xb7, 0x38, 0x13, 0xaf, 0x47, 0x85, 
-    0x84, 0x32, 0x33, 0xf3, 0x17, 0x49, 0xbf, 0xe9, 
-    0x96, 0xd0, 0xd6, 0x14, 0x6f, 0x13, 0x8d, 0xc5, 
-    0xfc, 0x2c, 0x72, 0xba, 0xac, 0xea, 0x7e, 0x18, 
-    0x53, 0x56, 0xa6, 0x83, 0xa2, 0xce, 0x93, 0x93, 
-    0xe7, 0x1f, 0x0f, 0xe6, 0x0f, 0x02, 0x03, 0x01, 
-    0x00, 0x01
+    0x30, 0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 

+    0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 

+    0x05, 0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81, 

+    0x89, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b, 

+    0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61, 

+    0x99, 0x0d, 0x36, 0x0f, 0xd4, 0x66, 0x88, 0x08, 

+    0x55, 0x84, 0xd5, 0x3a, 0xbf, 0x2b, 0xa4, 0x64, 

+    0x85, 0x7b, 0x0c, 0x04, 0x13, 0x3f, 0x8d, 0xf4, 

+    0xbc, 0x38, 0x0d, 0x49, 0xfe, 0x6b, 0xc4, 0x5a, 

+    0xb0, 0x40, 0x53, 0x3a, 0xd7, 0x66, 0x09, 0x0f, 

+    0x9e, 0x36, 0x74, 0x30, 0xda, 0x8a, 0x31, 0x4f, 

+    0x1f, 0x14, 0x50, 0xd7, 0xc7, 0x20, 0x94, 0x17, 

+    0xde, 0x4e, 0xb9, 0x57, 0x5e, 0x7e, 0x0a, 0xe5, 

+    0xb2, 0x65, 0x7a, 0x89, 0x4e, 0xb6, 0x47, 0xff, 

+    0x1c, 0xbd, 0xb7, 0x38, 0x13, 0xaf, 0x47, 0x85, 

+    0x84, 0x32, 0x33, 0xf3, 0x17, 0x49, 0xbf, 0xe9, 

+    0x96, 0xd0, 0xd6, 0x14, 0x6f, 0x13, 0x8d, 0xc5, 

+    0xfc, 0x2c, 0x72, 0xba, 0xac, 0xea, 0x7e, 0x18, 

+    0x53, 0x56, 0xa6, 0x83, 0xa2, 0xce, 0x93, 0x93, 

+    0xe7, 0x1f, 0x0f, 0xe6, 0x0f, 0x02, 0x03, 0x01, 

+    0x00, 0x01

   };
 
   std::vector<uint8> input;
@@ -186,168 +186,168 @@ TEST(RSAPrivateKeyUnitTest, PublicKeyTest) {
 // This test case verifies these two failures modes don't occur.
 TEST(RSAPrivateKeyUnitTest, ShortIntegers) {
   const uint8 short_integer_with_high_bit[] = {
-    0x30, 0x82, 0x02, 0x77, 0x02, 0x01, 0x00, 0x30, 
-    0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 
-    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 
-    0x02, 0x61, 0x30, 0x82, 0x02, 0x5d, 0x02, 0x01, 
-    0x00, 0x02, 0x81, 0x81, 0x00, 0x92, 0x59, 0x32, 
-    0x7d, 0x8e, 0xaf, 0x2e, 0xd5, 0xb2, 0x5c, 0x67, 
-    0xc8, 0x7d, 0x48, 0xb7, 0x84, 0x12, 0xd0, 0x76, 
-    0xda, 0xe1, 0xa3, 0x1e, 0x40, 0x01, 0x14, 0x5c, 
-    0xef, 0x26, 0x6e, 0x28, 0xa2, 0xf7, 0xa5, 0xb4, 
-    0x02, 0x37, 0xd0, 0x53, 0x10, 0xcb, 0x7c, 0x6a, 
-    0xf4, 0x53, 0x9f, 0xb8, 0xe0, 0x83, 0x93, 0xd1, 
-    0x19, 0xd8, 0x28, 0xd1, 0xd1, 0xd8, 0x87, 0x8f, 
-    0x92, 0xfd, 0x73, 0xc0, 0x4d, 0x3e, 0x07, 0x22, 
-    0x1f, 0xc1, 0x20, 0xb0, 0x70, 0xb2, 0x3b, 0xea, 
-    0xb1, 0xe5, 0x0a, 0xfd, 0x56, 0x49, 0x5e, 0x39, 
-    0x90, 0x91, 0xce, 0x04, 0x83, 0x29, 0xaa, 0xfd, 
-    0x12, 0xa4, 0x42, 0x26, 0x6c, 0x6e, 0x79, 0x70, 
-    0x77, 0x03, 0xb2, 0x07, 0x01, 0x3d, 0x85, 0x81, 
-    0x95, 0x9e, 0xda, 0x5a, 0xa3, 0xf4, 0x2d, 0x38, 
-    0x04, 0x58, 0xf5, 0x6b, 0xc9, 0xf1, 0xb5, 0x65, 
-    0xfe, 0x66, 0x0d, 0xa2, 0xd5, 0x02, 0x03, 0x01, 
-    0x00, 0x01, 0x02, 0x81, 0x80, 0x5e, 0x01, 0x5f, 
-    0xb6, 0x59, 0x1d, 0xdc, 0x36, 0xb6, 0x60, 0x36, 
-    0xe6, 0x08, 0xdb, 0xd9, 0xcd, 0xc3, 0x8c, 0x16, 
-    0x9c, 0x98, 0x8d, 0x7f, 0xd3, 0xdb, 0x1d, 0xaa, 
-    0x68, 0x8f, 0xc5, 0xf8, 0xe2, 0x5d, 0xb3, 0x19, 
-    0xc2, 0xc6, 0xf9, 0x51, 0x32, 0x1b, 0x93, 0x6a, 
-    0xdc, 0x50, 0x8e, 0xeb, 0x61, 0x84, 0x03, 0x42, 
-    0x30, 0x98, 0xb1, 0xf7, 0xbd, 0x14, 0x9a, 0x57, 
-    0x36, 0x33, 0x09, 0xd4, 0x3e, 0x90, 0xda, 0xef, 
-    0x09, 0x6e, 0xef, 0x49, 0xb6, 0x60, 0x68, 0x5e, 
-    0x54, 0x17, 0x25, 0x5b, 0x37, 0xe3, 0x35, 0x63, 
-    0x5b, 0x60, 0x3c, 0xbd, 0x50, 0xdf, 0x46, 0x43, 
-    0x08, 0xa4, 0x71, 0x21, 0xf1, 0x30, 0x71, 0xdc, 
-    0xda, 0xd7, 0x6f, 0xd2, 0x18, 0xbd, 0x39, 0xf1, 
-    0xe1, 0xbe, 0xa8, 0x8d, 0x62, 0xdf, 0xa2, 0x3e, 
-    0xb6, 0x15, 0x26, 0xb6, 0x57, 0xbd, 0x63, 0xdb, 
-    0xc1, 0x91, 0xec, 0xb8, 0x01, 0x02, 0x41, 0x00, 
-    0xc6, 0x1a, 0x06, 0x48, 0xf2, 0x12, 0x1c, 0x9f, 
-    0x74, 0x20, 0x5c, 0x85, 0xa2, 0xda, 0xe5, 0x62, 
-    0x96, 0x8d, 0x22, 0x7b, 0x78, 0x73, 0xea, 0xbb, 
-    0x9f, 0x59, 0x42, 0x13, 0x15, 0xc8, 0x11, 0x50, 
-    0x6c, 0x55, 0xf6, 0xdf, 0x8b, 0xfe, 0xc7, 0xdd, 
-    0xa8, 0xca, 0x54, 0x41, 0xe8, 0xce, 0xbe, 0x7d, 
-    0xbd, 0xe2, 0x13, 0x4b, 0x5b, 0x61, 0xeb, 0x69, 
-    0x6c, 0xb1, 0x9b, 0x28, 0x68, 0x5b, 0xd6, 0x01, 
-    0x02, 0x41, 0x00, 0xbd, 0x1e, 0xfe, 0x51, 0x99, 
-    0xb6, 0xe3, 0x84, 0xfe, 0xf1, 0x9e, 0xfd, 0x9c, 
-    0xe7, 0x86, 0x43, 0x68, 0x7f, 0x2f, 0x6a, 0x2a, 
-    0x4c, 0xae, 0xa6, 0x41, 0x1c, 0xf0, 0x10, 0x37, 
-    0x54, 0x23, 0xba, 0x05, 0x0d, 0x18, 0x27, 0x8d, 
-    0xb8, 0xe4, 0x8f, 0xf2, 0x25, 0x73, 0x8a, 0xd7, 
-    0x05, 0x98, 0x6b, 0x3d, 0x55, 0xb7, 0x6f, 0x7c, 
-    0xec, 0x77, 0x61, 0x54, 0x7b, 0xb6, 0x6b, 0x31, 
-    0xec, 0x94, 0xd5, 0x02, 0x41, 0x00, 0x90, 0xa2, 
-    0xa5, 0x9e, 0x12, 0xa7, 0x68, 0xa0, 0x7e, 0xdf, 
-    0xb5, 0xcd, 0x98, 0x26, 0xab, 0xbd, 0xbc, 0x5f, 
-    0xd5, 0x22, 0x42, 0xc2, 0x97, 0x4a, 0x5f, 0x40, 
-    0x82, 0xfe, 0x7e, 0x33, 0xb1, 0x78, 0x7f, 0x70, 
-    0x90, 0x2b, 0x8d, 0x01, 0xfb, 0x18, 0xfa, 0x48, 
-    0xa7, 0x15, 0xec, 0x0d, 0x2e, 0x85, 0x8d, 0xe2, 
-    0x86, 0xe5, 0xc9, 0x15, 0x88, 0x14, 0x53, 0xd8, 
-    0xa4, 0x88, 0xef, 0x10, 0xc6, 0x01, 0x02, 0x41, 
-    0x00, 0xba, 0xe4, 0xaf, 0x14, 0xfa, 0xdf, 0xf6, 
-    0xd5, 0xce, 0x8f, 0xfe, 0xbb, 0xc8, 0x5c, 0x30, 
-    0x9d, 0xda, 0xdd, 0x9d, 0x80, 0xc0, 0x0e, 0x89, 
-    0xa5, 0xb8, 0xc1, 0x1d, 0x28, 0x19, 0x55, 0x67, 
-    0xfd, 0x03, 0xd2, 0xdd, 0xe4, 0xf0, 0xb4, 0x20, 
-    0x03, 0x74, 0x9b, 0xb8, 0x24, 0x23, 0xbb, 0xde, 
-    0xd5, 0x53, 0x86, 0xaa, 0xc1, 0x5d, 0x65, 0xdd, 
-    0xcf, 0xec, 0x8a, 0x59, 0x4a, 0x73, 0xca, 0xc5, 
-    0x85, 0x02, 0x40, 0x00, 0xc4, 0x5e, 0x8d, 0xa4, 
-    0xea, 0xbb, 0x6a, 0x9b, 0xe6, 0x3a, 0x4d, 0xc1, 
-    0xdb, 0xe5, 0x52, 0x38, 0xf9, 0x59, 0x91, 0x2d, 
-    0x90, 0x82, 0xe3, 0x31, 0x1b, 0x48, 0xb7, 0x42, 
-    0xfa, 0x1d, 0x83, 0xd5, 0x3d, 0x02, 0xc2, 0x12, 
-    0x71, 0x10, 0x3a, 0xbd, 0x92, 0x8f, 0x9b, 0xa2, 
-    0x6b, 0x2d, 0x21, 0xa4, 0x65, 0xe9, 0xfa, 0x8c, 
-    0x30, 0x2a, 0x89, 0xce, 0xd0, 0xa7, 0x67, 0xd8, 
+    0x30, 0x82, 0x02, 0x77, 0x02, 0x01, 0x00, 0x30, 

+    0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 

+    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 

+    0x02, 0x61, 0x30, 0x82, 0x02, 0x5d, 0x02, 0x01, 

+    0x00, 0x02, 0x81, 0x81, 0x00, 0x92, 0x59, 0x32, 

+    0x7d, 0x8e, 0xaf, 0x2e, 0xd5, 0xb2, 0x5c, 0x67, 

+    0xc8, 0x7d, 0x48, 0xb7, 0x84, 0x12, 0xd0, 0x76, 

+    0xda, 0xe1, 0xa3, 0x1e, 0x40, 0x01, 0x14, 0x5c, 

+    0xef, 0x26, 0x6e, 0x28, 0xa2, 0xf7, 0xa5, 0xb4, 

+    0x02, 0x37, 0xd0, 0x53, 0x10, 0xcb, 0x7c, 0x6a, 

+    0xf4, 0x53, 0x9f, 0xb8, 0xe0, 0x83, 0x93, 0xd1, 

+    0x19, 0xd8, 0x28, 0xd1, 0xd1, 0xd8, 0x87, 0x8f, 

+    0x92, 0xfd, 0x73, 0xc0, 0x4d, 0x3e, 0x07, 0x22, 

+    0x1f, 0xc1, 0x20, 0xb0, 0x70, 0xb2, 0x3b, 0xea, 

+    0xb1, 0xe5, 0x0a, 0xfd, 0x56, 0x49, 0x5e, 0x39, 

+    0x90, 0x91, 0xce, 0x04, 0x83, 0x29, 0xaa, 0xfd, 

+    0x12, 0xa4, 0x42, 0x26, 0x6c, 0x6e, 0x79, 0x70, 

+    0x77, 0x03, 0xb2, 0x07, 0x01, 0x3d, 0x85, 0x81, 

+    0x95, 0x9e, 0xda, 0x5a, 0xa3, 0xf4, 0x2d, 0x38, 

+    0x04, 0x58, 0xf5, 0x6b, 0xc9, 0xf1, 0xb5, 0x65, 

+    0xfe, 0x66, 0x0d, 0xa2, 0xd5, 0x02, 0x03, 0x01, 

+    0x00, 0x01, 0x02, 0x81, 0x80, 0x5e, 0x01, 0x5f, 

+    0xb6, 0x59, 0x1d, 0xdc, 0x36, 0xb6, 0x60, 0x36, 

+    0xe6, 0x08, 0xdb, 0xd9, 0xcd, 0xc3, 0x8c, 0x16, 

+    0x9c, 0x98, 0x8d, 0x7f, 0xd3, 0xdb, 0x1d, 0xaa, 

+    0x68, 0x8f, 0xc5, 0xf8, 0xe2, 0x5d, 0xb3, 0x19, 

+    0xc2, 0xc6, 0xf9, 0x51, 0x32, 0x1b, 0x93, 0x6a, 

+    0xdc, 0x50, 0x8e, 0xeb, 0x61, 0x84, 0x03, 0x42, 

+    0x30, 0x98, 0xb1, 0xf7, 0xbd, 0x14, 0x9a, 0x57, 

+    0x36, 0x33, 0x09, 0xd4, 0x3e, 0x90, 0xda, 0xef, 

+    0x09, 0x6e, 0xef, 0x49, 0xb6, 0x60, 0x68, 0x5e, 

+    0x54, 0x17, 0x25, 0x5b, 0x37, 0xe3, 0x35, 0x63, 

+    0x5b, 0x60, 0x3c, 0xbd, 0x50, 0xdf, 0x46, 0x43, 

+    0x08, 0xa4, 0x71, 0x21, 0xf1, 0x30, 0x71, 0xdc, 

+    0xda, 0xd7, 0x6f, 0xd2, 0x18, 0xbd, 0x39, 0xf1, 

+    0xe1, 0xbe, 0xa8, 0x8d, 0x62, 0xdf, 0xa2, 0x3e, 

+    0xb6, 0x15, 0x26, 0xb6, 0x57, 0xbd, 0x63, 0xdb, 

+    0xc1, 0x91, 0xec, 0xb8, 0x01, 0x02, 0x41, 0x00, 

+    0xc6, 0x1a, 0x06, 0x48, 0xf2, 0x12, 0x1c, 0x9f, 

+    0x74, 0x20, 0x5c, 0x85, 0xa2, 0xda, 0xe5, 0x62, 

+    0x96, 0x8d, 0x22, 0x7b, 0x78, 0x73, 0xea, 0xbb, 

+    0x9f, 0x59, 0x42, 0x13, 0x15, 0xc8, 0x11, 0x50, 

+    0x6c, 0x55, 0xf6, 0xdf, 0x8b, 0xfe, 0xc7, 0xdd, 

+    0xa8, 0xca, 0x54, 0x41, 0xe8, 0xce, 0xbe, 0x7d, 

+    0xbd, 0xe2, 0x13, 0x4b, 0x5b, 0x61, 0xeb, 0x69, 

+    0x6c, 0xb1, 0x9b, 0x28, 0x68, 0x5b, 0xd6, 0x01, 

+    0x02, 0x41, 0x00, 0xbd, 0x1e, 0xfe, 0x51, 0x99, 

+    0xb6, 0xe3, 0x84, 0xfe, 0xf1, 0x9e, 0xfd, 0x9c, 

+    0xe7, 0x86, 0x43, 0x68, 0x7f, 0x2f, 0x6a, 0x2a, 

+    0x4c, 0xae, 0xa6, 0x41, 0x1c, 0xf0, 0x10, 0x37, 

+    0x54, 0x23, 0xba, 0x05, 0x0d, 0x18, 0x27, 0x8d, 

+    0xb8, 0xe4, 0x8f, 0xf2, 0x25, 0x73, 0x8a, 0xd7, 

+    0x05, 0x98, 0x6b, 0x3d, 0x55, 0xb7, 0x6f, 0x7c, 

+    0xec, 0x77, 0x61, 0x54, 0x7b, 0xb6, 0x6b, 0x31, 

+    0xec, 0x94, 0xd5, 0x02, 0x41, 0x00, 0x90, 0xa2, 

+    0xa5, 0x9e, 0x12, 0xa7, 0x68, 0xa0, 0x7e, 0xdf, 

+    0xb5, 0xcd, 0x98, 0x26, 0xab, 0xbd, 0xbc, 0x5f, 

+    0xd5, 0x22, 0x42, 0xc2, 0x97, 0x4a, 0x5f, 0x40, 

+    0x82, 0xfe, 0x7e, 0x33, 0xb1, 0x78, 0x7f, 0x70, 

+    0x90, 0x2b, 0x8d, 0x01, 0xfb, 0x18, 0xfa, 0x48, 

+    0xa7, 0x15, 0xec, 0x0d, 0x2e, 0x85, 0x8d, 0xe2, 

+    0x86, 0xe5, 0xc9, 0x15, 0x88, 0x14, 0x53, 0xd8, 

+    0xa4, 0x88, 0xef, 0x10, 0xc6, 0x01, 0x02, 0x41, 

+    0x00, 0xba, 0xe4, 0xaf, 0x14, 0xfa, 0xdf, 0xf6, 

+    0xd5, 0xce, 0x8f, 0xfe, 0xbb, 0xc8, 0x5c, 0x30, 

+    0x9d, 0xda, 0xdd, 0x9d, 0x80, 0xc0, 0x0e, 0x89, 

+    0xa5, 0xb8, 0xc1, 0x1d, 0x28, 0x19, 0x55, 0x67, 

+    0xfd, 0x03, 0xd2, 0xdd, 0xe4, 0xf0, 0xb4, 0x20, 

+    0x03, 0x74, 0x9b, 0xb8, 0x24, 0x23, 0xbb, 0xde, 

+    0xd5, 0x53, 0x86, 0xaa, 0xc1, 0x5d, 0x65, 0xdd, 

+    0xcf, 0xec, 0x8a, 0x59, 0x4a, 0x73, 0xca, 0xc5, 

+    0x85, 0x02, 0x40, 0x00, 0xc4, 0x5e, 0x8d, 0xa4, 

+    0xea, 0xbb, 0x6a, 0x9b, 0xe6, 0x3a, 0x4d, 0xc1, 

+    0xdb, 0xe5, 0x52, 0x38, 0xf9, 0x59, 0x91, 0x2d, 

+    0x90, 0x82, 0xe3, 0x31, 0x1b, 0x48, 0xb7, 0x42, 

+    0xfa, 0x1d, 0x83, 0xd5, 0x3d, 0x02, 0xc2, 0x12, 

+    0x71, 0x10, 0x3a, 0xbd, 0x92, 0x8f, 0x9b, 0xa2, 

+    0x6b, 0x2d, 0x21, 0xa4, 0x65, 0xe9, 0xfa, 0x8c, 

+    0x30, 0x2a, 0x89, 0xce, 0xd0, 0xa7, 0x67, 0xd8, 

     0x45, 0x84, 0xb0
   };
 
   const uint8 short_integer_without_high_bit[] = {
-    0x30, 0x82, 0x02, 0x76, 0x02, 0x01, 0x00, 0x30, 
-    0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 
-    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 
-    0x02, 0x60, 0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 
-    0x00, 0x02, 0x81, 0x81, 0x00, 0xc3, 0x9e, 0x8d, 
-    0xc4, 0x6d, 0x38, 0xe8, 0x0e, 0x9f, 0x84, 0x03, 
-    0x40, 0x8e, 0x81, 0x2e, 0x56, 0x67, 0x78, 0x11, 
-    0x85, 0x27, 0x81, 0x52, 0xf2, 0x1b, 0x3e, 0x5b, 
-    0xf8, 0xab, 0xfc, 0xaf, 0xca, 0x5c, 0x26, 0xd5, 
-    0xfa, 0xd4, 0x55, 0x50, 0x38, 0xb9, 0x9d, 0x89, 
-    0x92, 0x7e, 0x34, 0xcf, 0x37, 0x82, 0x48, 0x2d, 
-    0xaa, 0xc4, 0x6a, 0x0e, 0x93, 0xea, 0xad, 0x8a, 
-    0x33, 0xf0, 0x42, 0x23, 0xe0, 0x4c, 0x98, 0xbf, 
-    0x01, 0x00, 0x1b, 0xfe, 0x06, 0x15, 0xc6, 0xe3, 
-    0x80, 0x79, 0x6d, 0xfe, 0x48, 0xcd, 0x40, 0xbb, 
-    0xf9, 0x58, 0xe6, 0xbf, 0xd5, 0x4c, 0x29, 0x48, 
-    0x53, 0x78, 0x06, 0x03, 0x0d, 0x59, 0xf5, 0x20, 
-    0xe0, 0xe6, 0x8c, 0xb2, 0xf5, 0xd8, 0x61, 0x52, 
-    0x7e, 0x40, 0x83, 0xd7, 0x69, 0xae, 0xd7, 0x75, 
-    0x02, 0x2d, 0x49, 0xd5, 0x15, 0x5b, 0xf1, 0xd9, 
-    0x4d, 0x60, 0x7d, 0x62, 0xa5, 0x02, 0x03, 0x01, 
-    0x00, 0x01, 0x02, 0x7f, 0x6d, 0x45, 0x23, 0xeb, 
-    0x95, 0x17, 0x34, 0x88, 0xf6, 0x91, 0xc7, 0x3f, 
-    0x48, 0x5a, 0xe0, 0x87, 0x63, 0x44, 0xae, 0x84, 
-    0xb2, 0x8c, 0x8a, 0xc8, 0xb2, 0x6f, 0x22, 0xf0, 
-    0xc5, 0x21, 0x61, 0x10, 0xa8, 0x69, 0x09, 0x1e, 
-    0x13, 0x7d, 0x94, 0x52, 0x1b, 0x5c, 0xe4, 0x7b, 
-    0xf0, 0x03, 0x8f, 0xbc, 0x72, 0x09, 0xdf, 0x78, 
-    0x84, 0x3e, 0xb9, 0xe5, 0xe6, 0x31, 0x0a, 0x01, 
-    0xf9, 0x32, 0xf8, 0xd6, 0x57, 0xa3, 0x87, 0xe6, 
-    0xf5, 0x98, 0xbc, 0x8e, 0x41, 0xb9, 0x50, 0x17, 
-    0x7b, 0xd3, 0x97, 0x5a, 0x44, 0x3a, 0xee, 0xff, 
-    0x6b, 0xb3, 0x3a, 0x52, 0xe7, 0xa4, 0x96, 0x9a, 
-    0xf6, 0x83, 0xc8, 0x97, 0x1c, 0x63, 0xa1, 0xd6, 
-    0xb3, 0xa8, 0xb2, 0xc7, 0x73, 0x25, 0x0f, 0x58, 
-    0x36, 0xb9, 0x7a, 0x47, 0xa7, 0x4d, 0x30, 0xfe, 
-    0x4d, 0x74, 0x56, 0xe8, 0xfb, 0xd6, 0x50, 0xe5, 
-    0xe0, 0x28, 0x15, 0x02, 0x41, 0x00, 0xeb, 0x15, 
-    0x62, 0xb6, 0x37, 0x41, 0x7c, 0xc5, 0x00, 0x22, 
-    0x2c, 0x5a, 0x5e, 0xe4, 0xb2, 0x11, 0x87, 0x89, 
-    0xad, 0xf4, 0x57, 0x68, 0x90, 0xb7, 0x9f, 0xe2, 
-    0x79, 0x20, 0x6b, 0x98, 0x00, 0x0d, 0x3a, 0x3b, 
-    0xc1, 0xcd, 0x36, 0xf9, 0x27, 0xda, 0x40, 0x36, 
-    0x1d, 0xb8, 0x5c, 0x96, 0xeb, 0x04, 0x08, 0xe1, 
-    0x3f, 0xfa, 0x94, 0x8b, 0x0f, 0xa0, 0xff, 0xc1, 
-    0x51, 0xea, 0x90, 0xad, 0x15, 0xc7, 0x02, 0x41, 
-    0x00, 0xd5, 0x06, 0x45, 0xd7, 0x55, 0x63, 0x1a, 
-    0xf0, 0x89, 0x81, 0xae, 0x87, 0x23, 0xa2, 0x39, 
-    0xfe, 0x3d, 0x82, 0xc7, 0xcb, 0x15, 0xb9, 0xe3, 
-    0xe2, 0x5b, 0xc6, 0xd2, 0x55, 0xdd, 0xab, 0x55, 
-    0x29, 0x7c, 0xda, 0x0e, 0x1c, 0x09, 0xfc, 0x73, 
-    0x0d, 0x01, 0xed, 0x6d, 0x2f, 0x05, 0xd0, 0xd5, 
-    0x1d, 0xce, 0x18, 0x7f, 0xb0, 0xc8, 0x47, 0x77, 
-    0xd2, 0xa9, 0x9e, 0xfc, 0x39, 0x4b, 0x3d, 0x94, 
-    0x33, 0x02, 0x41, 0x00, 0x8f, 0x94, 0x09, 0x2d, 
-    0x17, 0x44, 0x75, 0x0a, 0xf1, 0x10, 0xee, 0x1b, 
-    0xe7, 0xd7, 0x2f, 0xf6, 0xca, 0xdc, 0x49, 0x15, 
-    0x72, 0x09, 0x58, 0x51, 0xfe, 0x61, 0xd8, 0xee, 
-    0xf7, 0x27, 0xe7, 0xe8, 0x2c, 0x47, 0xf1, 0x0f, 
-    0x00, 0x63, 0x5e, 0x76, 0xcb, 0x3f, 0x02, 0x19, 
-    0xe6, 0xda, 0xfa, 0x01, 0x05, 0xd7, 0x65, 0x37, 
-    0x0b, 0x60, 0x7f, 0x94, 0x2a, 0x80, 0x8d, 0x22, 
-    0x81, 0x68, 0x65, 0x63, 0x02, 0x41, 0x00, 0xc2, 
-    0xd4, 0x18, 0xde, 0x47, 0x9e, 0xfb, 0x8d, 0x91, 
-    0x05, 0xc5, 0x3c, 0x9d, 0xcf, 0x8a, 0x60, 0xc7, 
-    0x9b, 0x2b, 0xe5, 0xc6, 0xba, 0x1b, 0xfc, 0xf3, 
-    0xd9, 0x54, 0x97, 0xe9, 0xc4, 0x00, 0x80, 0x90, 
-    0x4a, 0xd2, 0x6a, 0xbc, 0x8b, 0x62, 0x22, 0x3c, 
-    0x68, 0x0c, 0xda, 0xdb, 0xe3, 0xd2, 0x76, 0x8e, 
-    0xff, 0x03, 0x12, 0x09, 0x2a, 0xac, 0x21, 0x44, 
-    0xb7, 0x3e, 0x91, 0x9c, 0x09, 0xf6, 0xd7, 0x02, 
-    0x41, 0x00, 0xc0, 0xa1, 0xbb, 0x70, 0xdc, 0xf8, 
-    0xeb, 0x17, 0x61, 0xd4, 0x8c, 0x7c, 0x3b, 0x82, 
-    0x91, 0x58, 0xff, 0xf9, 0x19, 0xac, 0x3a, 0x73, 
-    0xa7, 0x20, 0xe5, 0x22, 0x02, 0xc4, 0xf6, 0xb9, 
-    0xb9, 0x43, 0x53, 0x35, 0x88, 0xe1, 0x05, 0xb6, 
-    0x43, 0x9b, 0x39, 0xc8, 0x04, 0x4d, 0x2b, 0x01, 
-    0xf7, 0xe6, 0x1b, 0x8d, 0x7e, 0x89, 0xe3, 0x43, 
-    0xd4, 0xf3, 0xab, 0x28, 0xd4, 0x5a, 0x1f, 0x20, 
+    0x30, 0x82, 0x02, 0x76, 0x02, 0x01, 0x00, 0x30, 

+    0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 

+    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 

+    0x02, 0x60, 0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 

+    0x00, 0x02, 0x81, 0x81, 0x00, 0xc3, 0x9e, 0x8d, 

+    0xc4, 0x6d, 0x38, 0xe8, 0x0e, 0x9f, 0x84, 0x03, 

+    0x40, 0x8e, 0x81, 0x2e, 0x56, 0x67, 0x78, 0x11, 

+    0x85, 0x27, 0x81, 0x52, 0xf2, 0x1b, 0x3e, 0x5b, 

+    0xf8, 0xab, 0xfc, 0xaf, 0xca, 0x5c, 0x26, 0xd5, 

+    0xfa, 0xd4, 0x55, 0x50, 0x38, 0xb9, 0x9d, 0x89, 

+    0x92, 0x7e, 0x34, 0xcf, 0x37, 0x82, 0x48, 0x2d, 

+    0xaa, 0xc4, 0x6a, 0x0e, 0x93, 0xea, 0xad, 0x8a, 

+    0x33, 0xf0, 0x42, 0x23, 0xe0, 0x4c, 0x98, 0xbf, 

+    0x01, 0x00, 0x1b, 0xfe, 0x06, 0x15, 0xc6, 0xe3, 

+    0x80, 0x79, 0x6d, 0xfe, 0x48, 0xcd, 0x40, 0xbb, 

+    0xf9, 0x58, 0xe6, 0xbf, 0xd5, 0x4c, 0x29, 0x48, 

+    0x53, 0x78, 0x06, 0x03, 0x0d, 0x59, 0xf5, 0x20, 

+    0xe0, 0xe6, 0x8c, 0xb2, 0xf5, 0xd8, 0x61, 0x52, 

+    0x7e, 0x40, 0x83, 0xd7, 0x69, 0xae, 0xd7, 0x75, 

+    0x02, 0x2d, 0x49, 0xd5, 0x15, 0x5b, 0xf1, 0xd9, 

+    0x4d, 0x60, 0x7d, 0x62, 0xa5, 0x02, 0x03, 0x01, 

+    0x00, 0x01, 0x02, 0x7f, 0x6d, 0x45, 0x23, 0xeb, 

+    0x95, 0x17, 0x34, 0x88, 0xf6, 0x91, 0xc7, 0x3f, 

+    0x48, 0x5a, 0xe0, 0x87, 0x63, 0x44, 0xae, 0x84, 

+    0xb2, 0x8c, 0x8a, 0xc8, 0xb2, 0x6f, 0x22, 0xf0, 

+    0xc5, 0x21, 0x61, 0x10, 0xa8, 0x69, 0x09, 0x1e, 

+    0x13, 0x7d, 0x94, 0x52, 0x1b, 0x5c, 0xe4, 0x7b, 

+    0xf0, 0x03, 0x8f, 0xbc, 0x72, 0x09, 0xdf, 0x78, 

+    0x84, 0x3e, 0xb9, 0xe5, 0xe6, 0x31, 0x0a, 0x01, 

+    0xf9, 0x32, 0xf8, 0xd6, 0x57, 0xa3, 0x87, 0xe6, 

+    0xf5, 0x98, 0xbc, 0x8e, 0x41, 0xb9, 0x50, 0x17, 

+    0x7b, 0xd3, 0x97, 0x5a, 0x44, 0x3a, 0xee, 0xff, 

+    0x6b, 0xb3, 0x3a, 0x52, 0xe7, 0xa4, 0x96, 0x9a, 

+    0xf6, 0x83, 0xc8, 0x97, 0x1c, 0x63, 0xa1, 0xd6, 

+    0xb3, 0xa8, 0xb2, 0xc7, 0x73, 0x25, 0x0f, 0x58, 

+    0x36, 0xb9, 0x7a, 0x47, 0xa7, 0x4d, 0x30, 0xfe, 

+    0x4d, 0x74, 0x56, 0xe8, 0xfb, 0xd6, 0x50, 0xe5, 

+    0xe0, 0x28, 0x15, 0x02, 0x41, 0x00, 0xeb, 0x15, 

+    0x62, 0xb6, 0x37, 0x41, 0x7c, 0xc5, 0x00, 0x22, 

+    0x2c, 0x5a, 0x5e, 0xe4, 0xb2, 0x11, 0x87, 0x89, 

+    0xad, 0xf4, 0x57, 0x68, 0x90, 0xb7, 0x9f, 0xe2, 

+    0x79, 0x20, 0x6b, 0x98, 0x00, 0x0d, 0x3a, 0x3b, 

+    0xc1, 0xcd, 0x36, 0xf9, 0x27, 0xda, 0x40, 0x36, 

+    0x1d, 0xb8, 0x5c, 0x96, 0xeb, 0x04, 0x08, 0xe1, 

+    0x3f, 0xfa, 0x94, 0x8b, 0x0f, 0xa0, 0xff, 0xc1, 

+    0x51, 0xea, 0x90, 0xad, 0x15, 0xc7, 0x02, 0x41, 

+    0x00, 0xd5, 0x06, 0x45, 0xd7, 0x55, 0x63, 0x1a, 

+    0xf0, 0x89, 0x81, 0xae, 0x87, 0x23, 0xa2, 0x39, 

+    0xfe, 0x3d, 0x82, 0xc7, 0xcb, 0x15, 0xb9, 0xe3, 

+    0xe2, 0x5b, 0xc6, 0xd2, 0x55, 0xdd, 0xab, 0x55, 

+    0x29, 0x7c, 0xda, 0x0e, 0x1c, 0x09, 0xfc, 0x73, 

+    0x0d, 0x01, 0xed, 0x6d, 0x2f, 0x05, 0xd0, 0xd5, 

+    0x1d, 0xce, 0x18, 0x7f, 0xb0, 0xc8, 0x47, 0x77, 

+    0xd2, 0xa9, 0x9e, 0xfc, 0x39, 0x4b, 0x3d, 0x94, 

+    0x33, 0x02, 0x41, 0x00, 0x8f, 0x94, 0x09, 0x2d, 

+    0x17, 0x44, 0x75, 0x0a, 0xf1, 0x10, 0xee, 0x1b, 

+    0xe7, 0xd7, 0x2f, 0xf6, 0xca, 0xdc, 0x49, 0x15, 

+    0x72, 0x09, 0x58, 0x51, 0xfe, 0x61, 0xd8, 0xee, 

+    0xf7, 0x27, 0xe7, 0xe8, 0x2c, 0x47, 0xf1, 0x0f, 

+    0x00, 0x63, 0x5e, 0x76, 0xcb, 0x3f, 0x02, 0x19, 

+    0xe6, 0xda, 0xfa, 0x01, 0x05, 0xd7, 0x65, 0x37, 

+    0x0b, 0x60, 0x7f, 0x94, 0x2a, 0x80, 0x8d, 0x22, 

+    0x81, 0x68, 0x65, 0x63, 0x02, 0x41, 0x00, 0xc2, 

+    0xd4, 0x18, 0xde, 0x47, 0x9e, 0xfb, 0x8d, 0x91, 

+    0x05, 0xc5, 0x3c, 0x9d, 0xcf, 0x8a, 0x60, 0xc7, 

+    0x9b, 0x2b, 0xe5, 0xc6, 0xba, 0x1b, 0xfc, 0xf3, 

+    0xd9, 0x54, 0x97, 0xe9, 0xc4, 0x00, 0x80, 0x90, 

+    0x4a, 0xd2, 0x6a, 0xbc, 0x8b, 0x62, 0x22, 0x3c, 

+    0x68, 0x0c, 0xda, 0xdb, 0xe3, 0xd2, 0x76, 0x8e, 

+    0xff, 0x03, 0x12, 0x09, 0x2a, 0xac, 0x21, 0x44, 

+    0xb7, 0x3e, 0x91, 0x9c, 0x09, 0xf6, 0xd7, 0x02, 

+    0x41, 0x00, 0xc0, 0xa1, 0xbb, 0x70, 0xdc, 0xf8, 

+    0xeb, 0x17, 0x61, 0xd4, 0x8c, 0x7c, 0x3b, 0x82, 

+    0x91, 0x58, 0xff, 0xf9, 0x19, 0xac, 0x3a, 0x73, 

+    0xa7, 0x20, 0xe5, 0x22, 0x02, 0xc4, 0xf6, 0xb9, 

+    0xb9, 0x43, 0x53, 0x35, 0x88, 0xe1, 0x05, 0xb6, 

+    0x43, 0x9b, 0x39, 0xc8, 0x04, 0x4d, 0x2b, 0x01, 

+    0xf7, 0xe6, 0x1b, 0x8d, 0x7e, 0x89, 0xe3, 0x43, 

+    0xd4, 0xf3, 0xab, 0x28, 0xd4, 0x5a, 0x1f, 0x20, 

     0xea, 0xbe
   };
 
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 4ef4d08..a9f81ca 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -211,38 +211,27 @@ class ExtensionsServiceBackend::UnpackerClient
 };
 
 ExtensionsService::ExtensionsService(Profile* profile,
-                                     const CommandLine* command_line,
                                      MessageLoop* frontend_loop,
                                      MessageLoop* backend_loop)
     : extension_prefs_(new ExtensionPrefs(profile->GetPrefs())),
       backend_loop_(backend_loop),
       install_directory_(profile->GetPath().AppendASCII(kInstallDirectoryName)),
-      extensions_enabled_(false),
+      extensions_enabled_(
+          CommandLine::ForCurrentProcess()->
+          HasSwitch(switches::kEnableExtensions)),
       show_extensions_prompts_(true),
       ready_(false) {
-  // Figure out if extension installation should be enabled.
-  if (command_line->HasSwitch(switches::kEnableExtensions))
-    extensions_enabled_ = true;
-  else if (profile->GetPrefs()->GetBoolean(prefs::kEnableExtensions))
-    extensions_enabled_ = true;
-
   // We pass ownership of this object to the Backend.
   DictionaryValue* extensions = extension_prefs_->CopyCurrentExtensions();
   backend_ = new ExtensionsServiceBackend(
           install_directory_, g_browser_process->resource_dispatcher_host(),
-          frontend_loop, extensions, extensions_enabled());
+          frontend_loop, extensions);
 }
 
 ExtensionsService::~ExtensionsService() {
   UnloadAllExtensions();
 }
 
-void ExtensionsService::SetExtensionsEnabled(bool enabled) {
-  extensions_enabled_ = true;
-  backend_loop_->PostTask(FROM_HERE, NewRunnableMethod(backend_.get(),
-    &ExtensionsServiceBackend::set_extensions_enabled, enabled));
-}
-
 void ExtensionsService::Init() {
   DCHECK(extensions_.size() == 0);
 
@@ -365,14 +354,13 @@ void ExtensionsService::OnLoadedInstalledExtensions() {
 void ExtensionsService::OnExtensionsLoaded(ExtensionList* new_extensions) {
   scoped_ptr<ExtensionList> cleanup(new_extensions);
 
-  // Filter out any extensions that shouldn't be loaded. Themes are always
-  // loaded, but other extensions are only loaded if the extensions system is
-  // enabled.
+  // Filter out any extensions we don't want to enable. Themes are always
+  // enabled, but other extensions are only loaded if --enable-extensions is
+  // present.
   ExtensionList enabled_extensions;
   for (ExtensionList::iterator iter = new_extensions->begin();
        iter != new_extensions->end(); ++iter) {
-    if (extensions_enabled() || (*iter)->IsTheme() ||
-        (*iter)->location() == Extension::EXTERNAL_REGISTRY) {
+    if (extensions_enabled() || (*iter)->IsTheme()) {
       Extension* old = GetExtensionById((*iter)->id());
       if (old) {
         if ((*iter)->version()->CompareTo(*(old->version())) > 0) {
@@ -463,14 +451,12 @@ void ExtensionsService::SetProviderForTesting(
 
 ExtensionsServiceBackend::ExtensionsServiceBackend(
     const FilePath& install_directory, ResourceDispatcherHost* rdh,
-    MessageLoop* frontend_loop, DictionaryValue* extension_prefs,
-    bool extensions_enabled)
+    MessageLoop* frontend_loop, DictionaryValue* extension_prefs)
         : frontend_(NULL),
           install_directory_(install_directory),
           resource_dispatcher_host_(rdh),
           alert_on_error_(false),
-          frontend_loop_(frontend_loop),
-          extensions_enabled_(extensions_enabled) {
+          frontend_loop_(frontend_loop) {
   external_extension_providers_[Extension::EXTERNAL_PREF] =
       linked_ptr<ExternalExtensionProvider>(
           new ExternalPrefExtensionProvider(extension_prefs));
@@ -970,26 +956,28 @@ void ExtensionsServiceBackend::OnExtensionUnpacked(
     return;
   }
 
-  Extension::Location location = Extension::INTERNAL;
-  LookupExternalExtension(extension.id(), NULL, &location);
-
-  // We currently only allow themes and registry-installed extensions to be
-  // installed.
-  if (!extensions_enabled_ &&
-      !extension.IsTheme() &&
-      location != Extension::EXTERNAL_REGISTRY) {
+  if (!frontend_->extensions_enabled() && !extension.IsTheme()) {
+#if defined(OS_WIN)
+    if (frontend_->show_extensions_prompts()) {
+      win_util::MessageBox(GetForegroundWindow(),
+          L"Extensions are not enabled. Add --enable-extensions to the "
+          L"command-line to enable extensions.\n\n"
+          L"This is a temporary message and it will be removed when extensions "
+          L"UI is finalized.",
+          l10n_util::GetString(IDS_PRODUCT_NAME).c_str(), MB_OK);
+    }
+#endif
     ReportExtensionInstallError(extension_path,
-        "Extensions are not enabled. Add --enable-extensions to the "
-        "command-line to enable extensions.\n\n"
-        "This is a temporary message and it will be removed when extensions "
-        "UI is finalized.");
+        "Extensions are not enabled.");
     return;
   }
 
+  Extension::Location location = Extension::INTERNAL;
+  LookupExternalExtension(extension.id(), NULL, &location);
 #if defined(OS_WIN)
-  // We don't show the install dialog for themes or external extensions.
-  if (!extension.IsTheme() &&
-      !Extension::IsExternalLocation(location) &&
+  bool from_external = Extension::IsExternalLocation(location);
+
+  if (!extension.IsTheme() && !from_external &&
       frontend_->show_extensions_prompts() &&
       win_util::MessageBox(GetForegroundWindow(),
           L"Are you sure you want to install this extension?\n\n"
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index f4be29b..f2f0b56 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/linked_ptr.h"
 #include "base/ref_counted.h"
@@ -73,7 +72,6 @@ class ExtensionsService
   };
 
   ExtensionsService(Profile* profile,
-                    const CommandLine* command_line,
                     MessageLoop* frontend_loop,
                     MessageLoop* backend_loop);
   ~ExtensionsService();
@@ -134,13 +132,12 @@ class ExtensionsService
   // The name of the file that the current active version number is stored in.
   static const char* kCurrentVersionFileName;
 
-  void SetExtensionsEnabled(bool enabled);
-  bool extensions_enabled() { return extensions_enabled_; }
-
+  void set_extensions_enabled(bool enabled) { extensions_enabled_ = enabled; }
   void set_show_extensions_prompts(bool enabled) {
     show_extensions_prompts_ = enabled;
   }
 
+  bool extensions_enabled() { return extensions_enabled_; }
   bool show_extensions_prompts() {
     return show_extensions_prompts_;
   }
@@ -212,13 +209,10 @@ class ExtensionsServiceBackend
   ExtensionsServiceBackend(const FilePath& install_directory,
                            ResourceDispatcherHost* rdh,
                            MessageLoop* frontend_loop,
-                           DictionaryValue* extension_prefs,
-                           bool extensions_enabled);
+                           DictionaryValue* extension_prefs);
 
   virtual ~ExtensionsServiceBackend();
 
-  void set_extensions_enabled(bool enabled) { extensions_enabled_ = enabled; }
-
   // Loads the installed extensions.
   // Errors are reported through ExtensionErrorReporter. On completion,
   // OnExtensionsLoaded() is called with any successfully loaded extensions.
@@ -405,10 +399,6 @@ class ExtensionsServiceBackend
   // The message loop to use to call the frontend.
   MessageLoop* frontend_loop_;
 
-  // Whether non-theme extensions are enabled (themes and externally registered
-  // extensions are always enabled).
-  bool extensions_enabled_;
-
   // A map of all external extension providers.
   typedef std::map<Extension::Location,
                    linked_ptr<ExternalExtensionProvider> > ProviderMap;
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 06d343c..e2dd984 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json_reader.h"
@@ -25,7 +24,6 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ -132,9 +130,8 @@ class ExtensionsServiceTest
                    NotificationService::AllSources());
 
     profile_.reset(new TestingProfile());
-    service_ = new ExtensionsService(
-        profile_.get(), CommandLine::ForCurrentProcess(), &loop_, &loop_);
-    service_->SetExtensionsEnabled(true);
+    service_ = new ExtensionsService(profile_.get(), &loop_, &loop_);
+    service_->set_extensions_enabled(true);
     service_->set_show_extensions_prompts(false);
 
     // When we start up, we want to make sure there is no external provider,
@@ -194,7 +191,7 @@ class ExtensionsServiceTest
   }
 
   void SetExtensionsEnabled(bool enabled) {
-    service_->SetExtensionsEnabled(enabled);
+    service_->set_extensions_enabled(enabled);
   }
 
   void SetMockExternalProvider(Extension::Location location,
@@ -501,6 +498,8 @@ TEST_F(ExtensionsServiceTest, InstallExtension) {
 // Test Packaging and installing an extension.
 // TODO(rafaelw): add more tests for failure cases.
 TEST_F(ExtensionsServiceTest, PackExtension) {
+  SetExtensionsEnabled(true);
+
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
@@ -531,6 +530,8 @@ TEST_F(ExtensionsServiceTest, PackExtension) {
 // The privkey.pem is a PrivateKey, and the pcks8 -topk8 creates a
 // PrivateKeyInfo ASN.1 structure, we our RSAPrivateKey expects.
 TEST_F(ExtensionsServiceTest, PackExtensionOpenSSLKey) {
+  SetExtensionsEnabled(true);
+
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
   extensions_path = extensions_path.AppendASCII("extensions");
@@ -803,9 +804,6 @@ TEST_F(ExtensionsServiceTest, GenerateID) {
 #if defined(OS_WIN)
 
 TEST_F(ExtensionsServiceTest, ExternalInstallRegistry) {
-  // This should all work, even when normal extension installation is disabled.
-  SetExtensionsEnabled(false);
-
   // Verify that starting with no providers loads no extensions.
   service_->Init();
   loop_.RunAllPending();
@@ -1015,41 +1013,4 @@ TEST_F(ExtensionsServiceTest, ExternalInstallPref) {
   extension_path = extension_path.AppendASCII(good_crx);
   EXPECT_FALSE(file_util::PathExists(extension_path)) <<
       extension_path.ToWStringHack();
-
-  // This shouldn't work if extensions are disabled.
-  SetExtensionsEnabled(false);
-
-  pref_provider->UpdateOrAddExtension(good_crx, "1.0", source_path);
-  service_->CheckForUpdates();
-  loop_.RunAllPending();
-
-  ASSERT_EQ(0u, loaded_.size());
-  ASSERT_EQ(1u, GetErrors().size());
-}
-
-// Test that we get enabled/disabled correctly for all the pref/command-line
-// combinations.
-TEST(ExtensionsServiceTest2, Enabledness) {
-  TestingProfile profile;
-  MessageLoop loop;
-  scoped_ptr<CommandLine> command_line;
-  scoped_refptr<ExtensionsService> service;
-
-  // By default, we are disabled.
-  command_line.reset(new CommandLine(L""));
-  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
-  EXPECT_FALSE(service->extensions_enabled());
-
-  // If either the command line or pref is set, we are enabled.
-  command_line->AppendSwitch(switches::kEnableExtensions);
-  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
-  EXPECT_TRUE(service->extensions_enabled());
-
-  profile.GetPrefs()->SetBoolean(prefs::kEnableExtensions, true);
-  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
-  EXPECT_TRUE(service->extensions_enabled());
-
-  command_line.reset(new CommandLine(L""));
-  service = new ExtensionsService(&profile, command_line.get(), &loop, &loop);
-  EXPECT_TRUE(service->extensions_enabled());
 }
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 67e9810..179f506 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -478,7 +478,7 @@ void ProfileImpl::InitExtensions() {
       g_browser_process->file_thread()->message_loop(),
       script_dir);
   extensions_service_ = new ExtensionsService(
-      this, CommandLine::ForCurrentProcess(), MessageLoop::current(),
+      this, MessageLoop::current(),
       g_browser_process->file_thread()->message_loop());
 
   extensions_service_->Init();
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index a865349..06405ed 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/extensions/extension_message_service.h"
-#include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/plugin_service.h"
@@ -274,6 +273,7 @@ bool BrowserRenderProcessHost::Init() {
     switches::kUseLowFragHeapCrt,
     switches::kEnableWebWorkers,
     switches::kEnableStatsTable,
+    switches::kEnableExtensions,
     switches::kDisableOutOfProcessDevTools,
     switches::kAutoSpellCorrect,
     switches::kDisableAudio,
@@ -288,23 +288,6 @@ bool BrowserRenderProcessHost::Init() {
     }
   }
 
-  // Tell the renderer to enable extensions if there are any extensions loaded.
-  //
-  // NOTE: This is subtly different than just passing along whether
-  // --enable-extenisons is present in the browser process. For example, there
-  // is also an extensions.enabled preference, and there may be various special
-  // cases about whether to allow extensions to load. 
-  //
-  // This introduces a race condition where the first renderer never gets
-  // extensions enabled, so we also set the flag if extensions_enabled(). This
-  // isn't perfect though, because of the special cases above.
-  //
-  // TODO(aa): We need to get rid of the need to pass this flag at all. It is
-  // only used in one place in the renderer.
-  if (profile()->GetExtensionsService()->extensions()->size() > 0 ||
-      profile()->GetExtensionsService()->extensions_enabled())
-    cmd_line.AppendSwitch(switches::kEnableExtensions);
-
   // Pass on the browser locale.
   const std::wstring locale = g_browser_process->GetApplicationLocale();
   cmd_line.AppendSwitchWithValue(switches::kLang, locale);
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index d01ee94..8aa44b6 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1402,8 +1402,11 @@ void BrowserView::Init() {
 
   status_bubble_.reset(new StatusBubbleViews(GetWidget()));
 
-  extension_shelf_ = new ExtensionShelf(browser_.get());
-  AddChildView(extension_shelf_);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableExtensions)) {
+    extension_shelf_ = new ExtensionShelf(browser_.get());
+    AddChildView(extension_shelf_);
+  }
 
 #if defined(OS_WIN)
   InitSystemMenu();