Add Connectivity Diagnostic as component app for Chrome OS

BUG=chromium:260892
TEST=manual

Review URL: https://chromiumcodereview.appspot.com/19476004

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

5 files changed, 40 insertions, 0 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 2234ae0..e388f69 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -288,6 +288,8 @@
         <include name="IDR_CRYPTOHOME_JS" file="resources\chromeos\cryptohome.js" type="BINDATA" />
         <!-- manifest file of ChromeVox accessibility extension -->
         <include name="IDR_CHROMEVOX_MANIFEST" file="resources\chromeos\access_chromevox\manifest.json" type="BINDATA" />
+        <!-- manifest file of Connectivity Diagnostics app -->
+        <include name="IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST" file="resources\chromeos\connectivity_diagnostics\manifest.json" type="BINDATA" />
         <!-- manifest file of built-in speech synthesis extension -->
         <include name="IDR_SPEECH_SYNTHESIS_MANIFEST" file="resources\chromeos\speech_synthesis\manifest.json" type="BINDATA" />
         <include name="IDR_DIAGNOSTICS_MAIN_CSS" file="resources\chromeos\diagnostics\main.css" type="BINDATA" />
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 152e92f..1c4fe8d 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -452,6 +452,9 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
 
     Add(IDR_NETWORK_CONFIGURATION_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("chromeos/network_configuration")));
+
+    Add(IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
+        base::FilePath(extension_misc::kConnectivityDiagnosticsPath));
   }
 
   // Load ChromeVox extension now if spoken feedback is enabled.
diff --git a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json
new file mode 100644
index 0000000..345a72c
--- /dev/null
+++ b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json
@@ -0,0 +1,31 @@
+{
+  "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGJWLUb83WKoDeODlrPIZu60M8bzbvrkg3Jf/5aO3ux2FL+G+/BO4Vyt/J0t8lXBtnTOvHo6KPpA042PyE9xMdlufFnJqEkvPXNzRlBWeVQqFHbMWE6o/x8diG69dNmHyFYcUjjFFDk2X2GOLQXNUGJQ6MIikbdzoWdLGttmhAIwIDAQAB",
+  "manifest_version": 2,
+  "name": "Chrome Connectivity Debugger (Dev)",
+  "version": "0.2.8",
+  "minimum_chrome_version": "27",
+  "offline_enabled": true,
+  "default_locale": "en",
+  "icons": {
+    "128": "img/icon_128.png",
+    "16": "img/icon_16.png"
+  },
+  "permissions" : [
+   { "socket" : [
+     "tcp-connect:*:443",
+     "tcp-connect:*:80",
+     "tcp-connect:*:25",
+     "udp-bind:*",
+     "udp-send-to:*:53"
+   ]},
+   "clipboardWrite",
+   "experimental",
+   "http://*.google.com/*",
+   "http://www.yahoo.com/*"
+  ],
+  "app": {
+    "background": {
+      "scripts": ["background.js"]
+    }
+  }
+}
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 551db5e..1ca0105 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -143,6 +143,8 @@ const char kPlatformAppLaunchHistogram[] = "Apps.AppLaunch";
 #if defined(OS_CHROMEOS)
 const char kChromeVoxExtensionPath[] =
     "/usr/share/chromeos-assets/accessibility/extensions/access_chromevox";
+const char kConnectivityDiagnosticsPath[] =
+    "/usr/share/chromeos-assets/connectivity_diagnostics";
 const char kSpeechSynthesisExtensionPath[] =
     "/usr/share/chromeos-assets/speech_synthesis/patts";
 const char kSpeechSynthesisExtensionId[] =
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index f01c9e0..e4def4c 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -272,6 +272,8 @@ namespace extension_misc {
 #if defined(OS_CHROMEOS)
   // Path to preinstalled ChromeVox screen reader extension.
   extern const char kChromeVoxExtensionPath[];
+  // Path to preinstalled Connectivity Diagnostics extension.
+  extern const char kConnectivityDiagnosticsPath[];
   // Path to preinstalled speech synthesis extension.
   extern const char kSpeechSynthesisExtensionPath[];
   // The extension id of the speech synthesis extension.