Mac app mode: locate Chrome + refactor

chrome/app/chrome_main_app_mode_mac.mm

Index: chrome/app/chrome_main_app_mode_mac.mm
diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm
index 561d33f25995222416ab4dfbf3c69756d38df57a..92863c0f3d2a8624bf67ad65541e58428a186eb3 100644
--- a/chrome/app/chrome_main_app_mode_mac.mm
+++ b/chrome/app/chrome_main_app_mode_mac.mm
@@ -37,17 +37,17 @@ int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {
     return 1;
   }
 
-  RAW_CHECK(info->chrome_versioned_path);
+  RAW_CHECK(!info->chrome_versioned_path.empty());
   FilePath* chrome_versioned_path = new FilePath(info->chrome_versioned_path);
   RAW_CHECK(!chrome_versioned_path->empty());
   chrome::SetOverrideVersionedDirectory(chrome_versioned_path);
 
   // TODO(viettrungluu): do something intelligent with data
-//  return ChromeMain(info->argc, info->argv);
+  //  return ChromeMain(info->argc, info->argv);
   // For now, a cheesy hack instead.
-  RAW_CHECK(info->app_mode_url);
+  RAW_CHECK(info->app_mode_url.size());
   std::string argv1(std::string("--app=") + info->app_mode_url);
-  RAW_CHECK(info->app_mode_id);
+  RAW_CHECK(info->app_mode_id.size());
   std::string argv2(std::string("--user-data-dir=/tmp/") + info->app_mode_id);
   char* argv[] = { info->argv[0],
                    const_cast<char*>(argv1.c_str()),