"index" property should be optional with "chrome.tabs.move"

chrome/browser/extensions/extension_tabs_module.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/extension_tabs_module.h"
 
 #include <algorithm>
+#include <limits>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 1377 matching lines @@
 }
 
 bool MoveTabsFunction::RunImpl() {
   Value* tab_value = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &tab_value));
 
   std::vector<int> tab_ids;
   EXTENSION_FUNCTION_VALIDATE(ReadOneOrMoreIntegers(tab_value, &tab_ids));
 
   DictionaryValue* update_props = NULL;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
+  if (HasOptionalArgument(1)) {
+    EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
+  }
 
   int new_index = -1;
-  EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
-      keys::kIndexKey, &new_index));
-  EXTENSION_FUNCTION_VALIDATE(new_index >= 0);
+  if (update_props && update_props->HasKey(keys::kIndexKey)) {
+    EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
+        keys::kIndexKey, &new_index));
+    EXTENSION_FUNCTION_VALIDATE(new_index >= 0);
+  } else {
+    new_index = std::numeric_limits<int>::max();  // Will get clamped

[clintstaley, 2012/03/20 17:19:29]

. after all comments 

[mitchellwrosen, 2012/03/27 01:19:49]

Done.

+  }
 
   ListValue tab_values;
   for (size_t i = 0; i < tab_ids.size(); ++i) {
     Browser* source_browser = NULL;
     TabStripModel* source_tab_strip = NULL;
     TabContentsWrapper* contents = NULL;
     int tab_index = -1;
     if (!GetTabById(tab_ids[i], profile(), include_incognito(),
                     &source_browser, &source_tab_strip, &contents,
                     &tab_index, &error_))
       return false;
 
     // Don't let the extension move the tab if the user is dragging tabs.
     if (!source_browser->IsTabStripEditable()) {
       error_ = keys::kTabStripNotEditableError;
       return false;
     }
 
     // Insert the tabs one after another.
     new_index += i;
 
-    if (update_props->HasKey(keys::kWindowIdKey)) {
+    if (update_props && update_props->HasKey(keys::kWindowIdKey)) {
       Browser* target_browser = NULL;
       int window_id = extension_misc::kUnknownWindowId;
       EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
           keys::kWindowIdKey, &window_id));
       if (!GetBrowserFromWindowID(this, window_id, &target_browser))
         return false;
 
       if (!target_browser->IsTabStripEditable()) {
         error_ = keys::kTabStripNotEditableError;
         return false;
@@ skipping 369 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }