Remove dependency of chrome in WebRequestPermissions.

chrome/browser/extensions/chrome_app_sorting.cc

Index: chrome/browser/extensions/chrome_app_sorting.cc
diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc
index 10a4431c69a1dd6ce138cab2e06b0ac66e928107..13bbc33c7d2e2c91fcbedad60df280bea3e1f4aa 100644
--- a/chrome/browser/extensions/chrome_app_sorting.cc
+++ b/chrome/browser/extensions/chrome_app_sorting.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/extensions/extension_constants.h"

[Fady Samuel, 2014/08/29 19:39:46]

Is this still necessary?

[Xi Han, 2014/08/29 19:52:53]

Yes, this one is needed.

 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_scoped_prefs.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 
 #if defined(OS_CHROMEOS)
@@ -477,17 +478,17 @@ void ChromeAppSorting::InitializePageOrdinalMap(
 
     // Ensure that the web store app still isn't found in this list, since
     // it is added after this loop.
-    DCHECK(*ext_it != extension_misc::kWebStoreAppId);
+    DCHECK(*ext_it != extensions::kWebStoreAppId);
     DCHECK(*ext_it != extension_misc::kChromeAppId);
   }
 
   // Include the Web Store App since it is displayed on the NTP.
   syncer::StringOrdinal web_store_app_page =
-      GetPageOrdinal(extension_misc::kWebStoreAppId);
+      GetPageOrdinal(extensions::kWebStoreAppId);
   if (web_store_app_page.IsValid()) {
-    AddOrdinalMapping(extension_misc::kWebStoreAppId,
+    AddOrdinalMapping(extensions::kWebStoreAppId,
                       web_store_app_page,
-                      GetAppLaunchOrdinal(extension_misc::kWebStoreAppId));
+                      GetAppLaunchOrdinal(extensions::kWebStoreAppId));
   }
   // Include the Chrome App since it is displayed in the app launcher.
   syncer::StringOrdinal chrome_app_page =
@@ -550,7 +551,7 @@ void ChromeAppSorting::CreateDefaultOrdinals() {
 #else
   const char* kDefaultAppOrder[] = {
     extension_misc::kChromeAppId,
-    extension_misc::kWebStoreAppId,
+    extensions::kWebStoreAppId,
   };
   const std::vector<const char*> app_ids(
       kDefaultAppOrder, kDefaultAppOrder + arraysize(kDefaultAppOrder));