Cleanups to the refactored extension activity log code

chrome/browser/extensions/activity_log/activity_log.cc

 // Copyright (c) 2011 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/activity_log/activity_log.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 99 matching lines @@
   if (found) {
     *url = contents->GetURL();
     *is_incognito = browser->profile()->IsOffTheRecord();
     return true;
   } else {
     return false;
   }
 }
 
 // Translate tab IDs to URLs in tabs API calls.  Mutates the Action object in
-// place.  Translate tab IDs to URLs in tabs API calls.  It will swap out the
-// int in args with a URL as a string.  There is a small chance that the URL
-// translation could be wrong, if the tab has already been navigated by the
-// time of invocation.
+// place.  There is a small chance that the URL translation could be wrong, if
+// the tab has already been navigated by the time of invocation.
+//
+// If a single tab ID is translated to a URL, the URL is stored into arg_url
+// where it can more easily be searched for in the database.  For APIs that
+// take a list of tab IDs, replace each tab ID with the URL in the argument
+// list; we can only extract a single URL into arg_url so arbitrarily pull out
+// the first one.
 void LookupTabIds(scoped_refptr<extensions::Action> action, Profile* profile) {
   const std::string& api_call = action->api_name();
   if (api_call == "tabs.get" ||                 // api calls, ID as int
       api_call == "tabs.connect" ||
       api_call == "tabs.sendMessage" ||
       api_call == "tabs.duplicate" ||
       api_call == "tabs.update" ||
       api_call == "tabs.reload" ||
       api_call == "tabs.detectLanguage" ||
       api_call == "tabs.executeScript" ||
       api_call == "tabs.insertCSS" ||
       api_call == "tabs.move" ||                // api calls, IDs in array
       api_call == "tabs.remove" ||
       api_call == "tabs.onUpdated" ||           // events, ID as int
       api_call == "tabs.onMoved" ||
       api_call == "tabs.onDetached" ||
       api_call == "tabs.onAttached" ||
       api_call == "tabs.onRemoved" ||
       api_call == "tabs.onReplaced") {
     int tab_id;
     base::ListValue* id_list;
     base::ListValue* args = action->mutable_args();
     if (args->GetInteger(0, &tab_id)) {
+      // Single tab ID to translate.
       GURL url;
       bool is_incognito;
       if (GetUrlForTabId(tab_id, profile, &url, &is_incognito)) {
         action->set_arg_url(url);
         action->set_arg_incognito(is_incognito);
       }
     } else if ((api_call == "tabs.move" || api_call == "tabs.remove") &&
                args->GetList(0, &id_list)) {
+      // Array of tab IDs to translate.
       for (int i = 0; i < static_cast<int>(id_list->GetSize()); ++i) {
         if (id_list->GetInteger(i, &tab_id)) {
           GURL url;
           bool is_incognito;
           if (GetUrlForTabId(tab_id, profile, &url, &is_incognito) &&
-              !is_incognito)
+              !is_incognito) {
             id_list->Set(i, new base::StringValue(url.spec()));
+            if (i == 0) {
+              action->set_arg_url(url);
+              action->set_arg_incognito(is_incognito);
+            }
+          }
         } else {
           LOG(ERROR) << "The tab ID array is malformed at index " << i;
         }
       }
     }
   }
 }
 
 }  // namespace
 
@@ skipping 237 matching lines @@
            it2 != it->second.end();
            ++it2) {
         action->mutable_args()->AppendString(*it2);
       }
       LogAction(action);
     }
   }
 }
 
 }  // namespace extensions