Improving the process model extension API

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"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
+#include "chrome/browser/extensions/extension_function_util.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
 #include "chrome/browser/extensions/extension_window_list.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 161 matching lines @@
                                    browser, tab_strip, contents, tab_index))
     return true;
 
   if (error_message)
     *error_message = ExtensionErrorUtils::FormatErrorMessage(
         keys::kTabNotFoundError, base::IntToString(tab_id));
 
   return false;
 }
 
-// Reads the |value| as either a single integer value or a list of integers.
-bool ReadOneOrMoreIntegers(
-    Value* value, std::vector<int>* result) {
-  if (value->IsType(Value::TYPE_INTEGER)) {
-    int tab_id = -1;
-    if (!value->GetAsInteger(&tab_id))
-      return false;
-    result->push_back(tab_id);
-    return true;
-
-  } else if (value->IsType(Value::TYPE_LIST)) {
-    ListValue* tabs = static_cast<ListValue*>(value);
-    for (size_t i = 0; i < tabs->GetSize(); ++i) {
-      int tab_id = -1;
-      if (!tabs->GetInteger(i, &tab_id))
-        return false;
-      result->push_back(tab_id);
-    }
-    return true;
-  }
-  return false;
-}
-
 // A three state enum to distinguish between when a boolean query argument is
 // set or not.
 enum QueryArg {
   NOT_SET = -1,
   MATCH_FALSE,
   MATCH_TRUE
 };
 
 bool MatchesQueryArg(QueryArg arg, bool value) {
   if (arg == NOT_SET)
@@ skipping 904 matching lines @@
     return false;
 
   TabStripModel* tabstrip = browser->tab_strip_model();
   TabStripSelectionModel selection;
   int active_index = -1;
 
   Value* tab_value = NULL;
   EXTENSION_FUNCTION_VALIDATE(info->Get(keys::kTabsKey, &tab_value));
 
   std::vector<int> tab_indices;
-  EXTENSION_FUNCTION_VALIDATE(ReadOneOrMoreIntegers(tab_value, &tab_indices));
+  EXTENSION_FUNCTION_VALIDATE(extensions::ReadOneOrMoreIntegers(
+      tab_value, &tab_indices));
 
   // Create a new selection model as we read the list of tab indices.
   for (size_t i = 0; i < tab_indices.size(); ++i) {
     int index = tab_indices[i];
 
     // Make sure the index is in range.
     if (!tabstrip->ContainsIndex(index)) {
       error_ = ExtensionErrorUtils::FormatErrorMessage(
           keys::kTabIndexNotFoundError, base::IntToString(index));
       return false;
@@ skipping 204 matching lines @@
   if (success)
     PopulateResult();
   SendResponse(success);
 }
 
 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));
+  EXTENSION_FUNCTION_VALIDATE(extensions::ReadOneOrMoreIntegers(
+      tab_value, &tab_ids));
 
   DictionaryValue* update_props = NULL;
   int new_index;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
   EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(keys::kIndexKey,
       &new_index));
 
   ListValue tab_values;
   for (size_t i = 0; i < tab_ids.size(); ++i) {
     Browser* source_browser = NULL;
@@ skipping 149 matching lines @@
   }
 
   return true;
 }
 
 bool RemoveTabsFunction::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));
+  EXTENSION_FUNCTION_VALIDATE(extensions::ReadOneOrMoreIntegers(
+      tab_value, &tab_ids));
 
   for (size_t i = 0; i < tab_ids.size(); ++i) {
     Browser* browser = NULL;
     TabContentsWrapper* contents = NULL;
     if (!GetTabById(tab_ids[i], profile(), include_incognito(),
                     &browser, NULL, &contents, NULL, &error_))
       return false;
 
     // Don't let the extension remove a tab if the user is dragging tabs around.
     if (!browser->IsTabStripEditable()) {
@@ skipping 259 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()
 }