Write a test for loading libcros.so on startup of Chrome. You just pass the

--test-load-libcros on the command line. The browser will exit immediately and
the error code (and error messages) will indicate success or failure.

I also renamed loaded() static functions related to loading this library. These
are not simple getters since they will actually load the library if its not
loaded yet. I renamed it to EnsureLoaded.

TEST=This is a test
BUG=none
Review URL: http://codereview.chromium.org/387014

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

1 files changed, 7 insertions, 5 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 072f02e..d4230bc 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -310,11 +310,6 @@ const char kInternalNaCl[]                  = "internal-nacl";
 // Specifies the flags passed to JS engine
 const char kJavaScriptFlags[]               = "js-flags";
 
-#if !defined(OS_MACOSX)
-// Enable Kiosk mode.
-const char kKioskMode[]                     = "kiosk";
-#endif
-
 // Load an extension from the specified directory.
 const char kLoadExtension[]                 = "load-extension";
 
@@ -658,6 +653,10 @@ const char kCookiePipe[]                    = "cookie-pipe";
 // Enable the redirection of viewable document requests to the Google
 // Document Viewer.
 const char kEnableGView[]                   = "enable-gview";
+
+// Attempts to load libcros and validate it, then exits. A nonzero return code
+// means the library could not be loaded correctly.
+const char kTestLoadLibcros[]               = "test-load-libcros";
 #endif
 
 #if defined(OS_LINUX)
@@ -688,6 +687,9 @@ const char kNoProcessSingletonDialog[]      = "no-process-singleton-dialog";
 // Cause the OS X sandbox write to syslog every time an access to a resource
 // is denied by the sandbox.
 const char kEnableSandboxLogging[]          = "enable-sandbox-logging";
+#else
+// Enable Kiosk mode.
+const char kKioskMode[]                     = "kiosk";
 #endif
 
 #ifndef NDEBUG