Use the same version of Chrome Connectivity Diagnostics for Kiosk mode

BUG=487365

Review URL: https://codereview.chromium.org/1127263004

Cr-Commit-Position: refs/heads/master@{#329685}

chrome/browser/chromeos/login/screens/error_screen.cc

@@ -275,7 +275,7 @@ void ErrorScreen::OnDiagnoseButtonClicked() {
 
   std::string extension_id = extension_service->component_loader()->Add(
       IDR_CONNECTIVITY_DIAGNOSTICS_MANIFEST,
-      base::FilePath(extension_misc::kConnectivityDiagnosticsKioskPath));
+      base::FilePath(extension_misc::kConnectivityDiagnosticsPath));
 
   const extensions::Extension* extension =
       extension_service->GetExtensionById(extension_id, true);

chrome/common/extensions/extension_constants.cc

@@ -69,8 +69,6 @@ const char kBrailleImeEngineId[] =
     "_comp_ime_jddehjeebkoimngcbdkaahpobgicbffpbraille";
 const char kConnectivityDiagnosticsPath[] =
     "/usr/share/chromeos-assets/connectivity_diagnostics";
-const char kConnectivityDiagnosticsKioskPath[] =
-    "/usr/share/chromeos-assets/connectivity_diagnostics_kiosk";
 const char kConnectivityDiagnosticsLauncherPath[] =
     "/usr/share/chromeos-assets/connectivity_diagnostics_launcher";
 const char kFirstRunDialogId[] = "jdgcneonijmofocbhmijhacgchbihela";

chrome/common/extensions/extension_constants.h

@@ -203,7 +203,6 @@ extern const char kBrailleImeExtensionPath[];
 extern const char kBrailleImeEngineId[];
 // Path to preinstalled Connectivity Diagnostics extension.
 extern const char kConnectivityDiagnosticsPath[];
-extern const char kConnectivityDiagnosticsKioskPath[];
 extern const char kConnectivityDiagnosticsLauncherPath[];
 // The extension id of the first run dialog application.
 extern const char kFirstRunDialogId[];