Don't delay network requests for webNavigation, and re-enable the permission warning

BUG=107254,107255
TEST=as described in the bug

Review URL: http://codereview.chromium.org/8922014

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

chrome/common/extensions/extension.cc

@@ -2757,8 +2757,7 @@ bool Extension::ShowConfigureContextMenus() const {
 bool Extension::ImplicitlyDelaysNetworkStartup() const {
   // Network requests should be deferred until any extensions that might want
   // to observe or modify them are loaded.
-  return HasAPIPermission(ExtensionAPIPermission::kWebNavigation) ||
-      HasAPIPermission(ExtensionAPIPermission::kWebRequest);
+  return HasAPIPermission(ExtensionAPIPermission::kWebRequest);
 }
 
 bool Extension::CanSpecifyAPIPermission(

chrome/common/extensions/extension_permission_set.cc

@@ -271,8 +271,9 @@ void ExtensionAPIPermission::RegisterAllPermissions(
       kTtsEngine, "ttsEngine", IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE,
       ExtensionPermissionMessage::kTtsEngine, kFlagNone, kTypeDefault);
   info->RegisterPermission(
-      kWebNavigation, "webNavigation", 0,
-      ExtensionPermissionMessage::kNone, kFlagSupportsOptional,
+      kWebNavigation, "webNavigation",
+      IDS_EXTENSION_PROMPT_WARNING_TABS,
+      ExtensionPermissionMessage::kTabs, kFlagSupportsOptional,
       kTypeDefault - kTypePlatformApp);
   info->RegisterPermission(
       kWebRequest, "webRequest", 0,

chrome/common/extensions/extension_permission_set_unittest.cc

@@ -648,10 +648,9 @@ TEST(ExtensionPermissionSetTest, PermissionMessages) {
   // permissions.
   skip.insert(ExtensionAPIPermission::kCookie);
 
-  // The proxy, webNavigation, and webRequest permissions are warned as part of
-  // host permission checks.
+  // The proxy, and webRequest permissions are warned as part of host
+  // permission checks.
   skip.insert(ExtensionAPIPermission::kProxy);
-  skip.insert(ExtensionAPIPermission::kWebNavigation);
   skip.insert(ExtensionAPIPermission::kWebRequest);
   skip.insert(ExtensionAPIPermission::kWebRequestBlocking);
 

chrome/test/data/extensions/network_delay/pjohnlkdpdolplmenneanegndccmdlpc/1.0/manifest.json

@@ -4,5 +4,5 @@
   "manifest_version": 2,
   "name": "My startup delay extension 2",
   "background_page": "background.html",
-  "permissions": ["tabs", "webNavigation"]
+  "permissions": ["tabs", "webRequest"]
 }