Handle null Extension*s in AppRestoreService.

chrome/browser/extensions/app_restore_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/app_restore_service.h"
 
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 39 matching lines @@
     }
   }
 }
 
 void AppRestoreService::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
       ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
-      if (host->extension()->is_platform_app()) {
-        RecordAppStart(host->extension()->id());
+      const Extension* extension = host->extension();
+      if (extension && extension->is_platform_app()) {
+        RecordAppStart(extension->id());
       }
       break;
     }
 
     case chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED: {
       ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
       if (host->extension()->is_platform_app()) {

[benwells, 2012/10/22 00:07:56]

Is the NULL check needed here as well?

[koz (OOO until 15th September), 2012/10/25 03:49:47]

Yes, it is. Seeing as this patch has already landed and I'm in China (and
therefore unable to really do work) could you add the check for me?

         RecordAppStop(host->extension()->id());
       }
       break;
     }
 
     case chrome::NOTIFICATION_APP_TERMINATING: {
       // Stop listening to NOTIFICATION_EXTENSION_HOST_DESTROYED in particular
       // as all extension hosts will be destroyed as a result of shutdown.
       registrar_.RemoveAll();
       break;
@@ skipping 12 matching lines @@
   ExtensionPrefs* extension_prefs =
       ExtensionSystem::Get(profile_)->extension_service()->extension_prefs();
   extension_prefs->SetExtensionRunning(extension_id, false);
 }
 
 void AppRestoreService::RestoreApp(const Extension* extension) {
   AppEventRouter::DispatchOnRestartedEvent(profile_, extension);
 }
 
 }  // namespace extensions