Fix issue that causes some extensions to be disabled right after installation.

chrome/browser/extensions/extensions_service_unittest.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/browser/extensions/extensions_service_unittest.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1161 matching lines @@
   ASSERT_EQ(1u, service_->extensions()->size());
   std::string extension_id = service_->extensions()->at(0)->id();
   EXPECT_EQ(permissions_crx, extension_id);
 
 
   // Verify that the valid API permissions have been recognized.
   expected_api_perms.insert("tabs");
 
   AddPattern(&expected_host_perms, "http://*.google.com/*");
   AddPattern(&expected_host_perms, "https://*.google.com/*");
+  AddPattern(&expected_host_perms, "http://*.google.com.hk/*");
   AddPattern(&expected_host_perms, "http://www.example.com/*");
 
   EXPECT_TRUE(prefs->GetGrantedPermissions(extension_id,
                                            &full_access,
                                            &known_api_perms,
                                            &known_host_perms));
 
   EXPECT_EQ(expected_api_perms, known_api_perms);
   EXPECT_FALSE(full_access);
   AssertEqualExtents(&expected_host_perms, &known_host_perms);
@@ skipping 58 matching lines @@
   std::string extension_id = extension->id();
 
   ExtensionPrefs* prefs = service_->extension_prefs();
 
   std::set<std::string> expected_api_permissions;
   ExtensionExtent expected_host_permissions;
 
   expected_api_permissions.insert("tabs");
   AddPattern(&expected_host_permissions, "http://*.google.com/*");
   AddPattern(&expected_host_permissions, "https://*.google.com/*");
+  AddPattern(&expected_host_permissions, "http://*.google.com.hk/*");
   AddPattern(&expected_host_permissions, "http://www.example.com/*");
 
   std::set<std::string> api_permissions;
   std::set<std::string> host_permissions;
 
   // Test that the extension is disabled when an API permission is missing from
   // the extension's granted api permissions preference. (This simulates
   // updating the browser to a version which recognizes a new API permission).
   SetPrefStringSet(extension_id, "granted_permissions.api", api_permissions);
 
@@ skipping 29 matching lines @@
   // updating the browser to a version which recognizes additional host
   // permissions).
   api_permissions.clear();
   host_permissions.clear();
   current_api_permissions.clear();
   current_host_permissions.ClearPaths();
 
   api_permissions.insert("tabs");
   host_permissions.insert("http://*.google.com/*");
   host_permissions.insert("https://*.google.com/*");
+  host_permissions.insert("http://*.google.com.hk/*");
 
   SetPrefStringSet(extension_id, "granted_permissions.api", api_permissions);
   SetPrefStringSet(extension_id, "granted_permissions.host", host_permissions);
 
   service_->ReloadExtensions();
 
   EXPECT_EQ(1u, service_->disabled_extensions()->size());
   extension = service_->disabled_extensions()->at(0);
 
   ASSERT_TRUE(prefs->GetExtensionState(extension_id) == Extension::DISABLED);
@@ skipping 1854 matching lines @@
   // Component extensions shouldn't get recourded in the prefs.
   ValidatePrefKeyCount(0);
 
   // Reload all extensions, and make sure it comes back.
   std::string extension_id = service_->extensions()->at(0)->id();
   loaded_.clear();
   service_->ReloadExtensions();
   ASSERT_EQ(1u, service_->extensions()->size());
   EXPECT_EQ(extension_id, service_->extensions()->at(0)->id());
 }