Revert 32626 - Remove the expiration check from Chrome code

BUG= http://code.google.com/p/nativeclient/issues/detail?id=119
TEST=none

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

TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/418013

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

1 files changed, 8 insertions, 5 deletions

diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index e035f92..82df9c3 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -8,8 +8,6 @@
 #include <crt_externs.h>
 #endif
 
-#define NACL_NO_INLINE
-
 EXTERN_C_BEGIN
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
@@ -52,8 +50,6 @@ static void StopForDebuggerInit(const struct NaClApp *state) {
 }
 
 int SelMain(const int desc, const NaClHandle handle) {
-  return 0;
-#if 0  // TODO(gregoryd): enable when the service runtime is ready
   char *av[1];
   int ac = 1;
 
@@ -76,6 +72,14 @@ int SelMain(const int desc, const NaClHandle handle) {
   envp = environ;
 #endif
 
+
+  if (NaClHasExpired()) {
+    // TODO(gregoryd): report error to browser?
+    fprintf(stderr, "This version of Native Client has expired.\n");
+    fprintf(stderr, "Please visit: http://code.google.com/p/nativeclient/\n");
+    exit(-1);
+  }
+
   NaClAllModulesInit();
 
   /* used to be -P */
@@ -200,6 +204,5 @@ int SelMain(const int desc, const NaClHandle handle) {
   NaClAllModulesFini();
 
   return ret_code;
-#endif
 }