use EXTENSION_FUNCTION_VALIDATE

chrome/browser/extensions/extension_tabs_module.cc

 // Copyright (c) 2009 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 "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
@@ skipping 26 matching lines @@
 
 int ExtensionTabUtil::GetWindowIdOfTab(const TabContents* tab_contents) {
   return tab_contents->controller().window_id().id();
 }
 
 bool GetWindowsFunction::RunImpl() {
   std::set<int> window_ids;
 
   // Look for |ids| named parameter as list of id's to fetch.
   if (args_->IsType(Value::TYPE_DICTIONARY)) {
-    Value *ids_value;
-    if ((!static_cast<DictionaryValue*>(args_)->Get(L"ids", &ids_value)) ||
-        (!ids_value->IsType(Value::TYPE_LIST))) {
-      DCHECK(false);
-      return false;
-    }
-
-    ListValue *window_id_list = static_cast<ListValue*>(ids_value);
+    ListValue *window_id_list;
+    const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
+    EXTENSION_FUNCTION_VALIDATE(args->GetList(L"ids", &window_id_list));
     for (ListValue::iterator id = window_id_list->begin();
          id != window_id_list->end(); ++id) {
       int window_id;
-      if (!(*id)->GetAsInteger(&window_id)) {
-        DCHECK(false);
-        return false;
-      }
-
+      EXTENSION_FUNCTION_VALIDATE((*id)->GetAsInteger(&window_id));
       window_ids.insert(window_id);
     }
   }
 
   // Default to all windows.
   bool all_windows = (window_ids.size() == 0);
 
   result_.reset(new ListValue());
   for (BrowserList::const_iterator browser = BrowserList::begin();
        browser != BrowserList::end(); ++browser) {
@@ skipping 70 matching lines @@
   new_window->window()->Show();
 
   // TODO(rafaelw): support |focused|, |zIndex|
 
   result_.reset(CreateWindowValue(new_window));
 
   return true;
 }
 
 bool RemoveWindowFunction::RunImpl() {
-  if (!args_->IsType(Value::TYPE_INTEGER))
-    return false;
-
   int window_id;
-  if (!args_->GetAsInteger(&window_id))
-    return false;
+  EXTENSION_FUNCTION_VALIDATE(args_->GetAsInteger(&window_id));
 
   Browser* target = NULL;
   for (BrowserList::const_iterator browser = BrowserList::begin();
       browser != BrowserList::end(); ++browser) {
     // Only examine browsers in the current profile.
     if ((*browser)->profile() == profile()) {
       if (ExtensionTabUtil::GetWindowId(*browser) == window_id) {
         target = *browser;
         break;
       }
     }
   }
 
   if (target == NULL) {
     // TODO(rafaelw): need error message.
     return false;
   }
 
   target->CloseWindow();
 
   return true;
 }
 
 
 bool GetTabsForWindowFunction::RunImpl() {
-  if (!args_->IsType(Value::TYPE_NULL))
-    return false;
+  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_NULL));
 
   Browser* browser = dispatcher_->browser();
   if (!browser)
     return false;
 
   result_.reset(CreateTabList(browser));
 
   return true;
 }
 
 bool CreateTabFunction::RunImpl() {
-  // TODO(aa): Do data-driven validation in JS.
-  if (!args_->IsType(Value::TYPE_DICTIONARY))
-    return false;
+  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
+  const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return false;
 
   TabStripModel *tab_strip = browser->tabstrip_model();
-  const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
 
   // TODO(rafaelw): handle setting remaining tab properties:
   // -windowId
   // -title
   // -favIconUrl
 
   std::string url;
   args->GetString(L"url", &url);
 
   // Default to foreground for the new tab. The presence of 'selected' property
@@ skipping 18 matching lines @@
   index = tab_strip->GetIndexOfTabContents(contents);
 
   // Return data about the newly created tab.
   if (has_callback())
     result_.reset(CreateTabValue(tab_strip, index));
 
   return true;
 }
 
 bool GetTabFunction::RunImpl() {
-  if (!args_->IsType(Value::TYPE_INTEGER))
-    return false;
+  int tab_id;
+  EXTENSION_FUNCTION_VALIDATE(args_->GetAsInteger(&tab_id));
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return false;
 
-  int tab_id;
-  args_->GetAsInteger(&tab_id);
-
   int tab_index;
   TabStripModel* tab_strip = browser->tabstrip_model();
   // TODO(rafaelw): return an error if the tab is not found by |tab_id|
   if (!GetIndexOfTabId(tab_strip, tab_id, &tab_index))
     return false;
 
   result_.reset(CreateTabValue(tab_strip, tab_index));
   return true;
 }
 
 bool UpdateTabFunction::RunImpl() {
-  // TODO(aa): Do data-driven validation in JS.
-  if (!args_->IsType(Value::TYPE_DICTIONARY))
-    return false;
+  int tab_id;
+  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
+  const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
+  EXTENSION_FUNCTION_VALIDATE(args->GetInteger(L"id", &tab_id));
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return false;
 
-  int tab_id;
-  const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
-  if (!args->GetInteger(L"id", &tab_id))
-    return false;
-
   int tab_index;
   TabStripModel* tab_strip = browser->tabstrip_model();
   // TODO(rafaelw): return an error if the tab is not found by |tab_id|
   if (!GetIndexOfTabId(tab_strip, tab_id, &tab_index))
     return false;
 
   TabContents* tab_contents = tab_strip->GetTabContentsAt(tab_index);
   NavigationController& controller = tab_contents->controller();
 
   // TODO(rafaelw): handle setting remaining tab properties:
@@ skipping 17 matching lines @@
   if (args->GetBoolean(L"selected", &selected) &&
       selected &&
       tab_strip->selected_index() != tab_index) {
     tab_strip->SelectTabContentsAt(tab_index, false);
   }
 
   return true;
 }
 
 bool MoveTabFunction::RunImpl() {
-  if (!args_->IsType(Value::TYPE_DICTIONARY))
-    return false;
+  int tab_id;
+  int new_index;
+  EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_DICTIONARY));
+  const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
+  EXTENSION_FUNCTION_VALIDATE(args->GetInteger(L"id", &tab_id));
+  EXTENSION_FUNCTION_VALIDATE(args->GetInteger(L"index", &new_index));
+  EXTENSION_FUNCTION_VALIDATE(new_index >= 0);
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return false;
 
-  int tab_id;
-  const DictionaryValue *args = static_cast<const DictionaryValue*>(args_);
-  if (!args->GetInteger(L"id", &tab_id))
-    return false;
-
   int tab_index;
   TabStripModel* tab_strip = browser->tabstrip_model();
   // TODO(rafaelw): return an error if the tab is not found by |tab_id|
   if (!GetIndexOfTabId(tab_strip, tab_id, &tab_index))
     return false;
 
   // TODO(rafaelw): support moving tabs between windows
   // -windowId
 
-  int new_index;
-  bool found_index = args->GetInteger(L"index", &new_index);
-  if (!found_index || new_index < 0) {
-    DCHECK(false);
-    return false;
-  }
-
   // Clamp move location to the last position.
   if (new_index >= tab_strip->count()) {
     new_index = tab_strip->count() - 1;
   }
 
   if (new_index != tab_index) {
     tab_strip->MoveTabContentsAt(tab_index, new_index, false);
   }
 
   return true;
 }
 
 
 bool RemoveTabFunction::RunImpl() {
   // TODO(rafaelw): This should have a callback, but it can't because it could
   // close it's own tab.
-
-  if (!args_->IsType(Value::TYPE_INTEGER))
-    return false;
+  int tab_id;
+  EXTENSION_FUNCTION_VALIDATE(args_->GetAsInteger(&tab_id));
 
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return false;
 
-  int tab_id;
-  if (!args_->GetAsInteger(&tab_id)) {
-    return false;
-  }
-
   int tab_index;
   TabStripModel* tab_strip = browser->tabstrip_model();
   if (GetIndexOfTabId(tab_strip, tab_id, &tab_index)) {
     browser->CloseTabContents(tab_strip->GetTabContentsAt(tab_index));
     return true;
   }
 
   return false;
 }
 
@@ skipping 50 matching lines @@
                             int* tab_index) {
   for (int i = 0; i < tab_strip->count(); ++i) {
     TabContents* tab_contents = tab_strip->GetTabContentsAt(i);
     if (tab_contents->controller().session_id().id() == tab_id) {
       *tab_index = i;
       return true;
     }
   }
   return false;
 }