Do NULL checks on TabAndroids retrieved from the model

chrome/browser/android/dev_tools_server.cc

Index: chrome/browser/android/dev_tools_server.cc
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index af04acca20aa0553408bfe9a1b6af787dc956523..82380c61d323b35c23e9a322b8d99d28c67dd799 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -188,6 +188,9 @@ class TabTarget : public TargetBase {
     if (!web_contents) {
       // The tab has been pushed out of memory, pull it back.
       TabAndroid* tab = model->GetTabAt(index);
+      if (!tab)

[dgozman, 2014/09/05 05:33:03]

I wonder whether DevTools is the only place which calls GetTabAt() and expects a
Tab instead of NULL. Sounds like a strange container API.

+        return NULL;
+
       tab->LoadIfNeeded();
       web_contents = model->GetWebContentsAt(index);
       if (!web_contents)
@@ -231,7 +234,7 @@ class TabTarget : public TargetBase {
       TabModel* model = *iter;
       for (int i = 0; i < model->GetTabCount(); ++i) {
         TabAndroid* tab = model->GetTabAt(i);
-        if (tab->GetAndroidId() == tab_id_) {
+        if (tab && tab->GetAndroidId() == tab_id_) {
           *model_result = model;
           *index_result = i;
           return true;
@@ -363,6 +366,8 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
       TabModel* model = *iter;
       for (int i = 0; i < model->GetTabCount(); ++i) {
         TabAndroid* tab = model->GetTabAt(i);
+        if (!tab) continue;
+
         WebContents* web_contents = model->GetWebContentsAt(i);
         if (web_contents) {
           tab_web_contents.insert(web_contents);