Check library version and handle library load errors

chrome/app/android/chrome_android_initializer.cc

Index: chrome/app/android/chrome_android_initializer.cc
diff --git a/chrome/app/android/chrome_android_initializer.cc b/chrome/app/android/chrome_android_initializer.cc
index dd7d46f89e0a4bf600df28d709ba2f230e531c95..89425fd9a4cb2442f7179942bf7e5210a16a1659 100644
--- a/chrome/app/android/chrome_android_initializer.cc
+++ b/chrome/app/android/chrome_android_initializer.cc
@@ -7,6 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "chrome/app/android/chrome_main_delegate_android.h"
+#include "chrome/common/chrome_version_info.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 #include "net/proxy/proxy_resolver_v8.h"
@@ -17,6 +18,11 @@ jint RunChrome(JavaVM* vm, ChromeMainDelegateAndroid* main_delegate) {
   if (!content::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
+  // Pass the library version number to content so that we can check it from the
+  // Java side before continuing initialization
+  chrome::VersionInfo vi;
+  content::SetVersionName(vi.Version());

[joth, 2013/11/11 20:28:56]

Version() returns the version "number" so bit confusing to pass it to set
version "name".

(maybe a comment on content::SetVersionName explaining exactly what the string
set is for, and how it is used, would make sense)

[aberent, 2013/11/13 20:20:52]

I thought originally that this was going to match the Android "VersionName", but
in the end this didn't work. I will change this to Version or VersionNumber (or
VERSION_NUMBER etc.) throughout (even if "1.2.3.4" isn't really a number).
Isn't this covered by the comment in android_library_loader_hooks.h?

+
   DCHECK(main_delegate);
   content::SetContentMainDelegate(main_delegate);