Move chrome.downloads out of experimental to dev

chrome/browser/extensions/api/downloads/downloads_api.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/download/download_extension_api.h"
+#include "chrome/browser/extensions/api/downloads/downloads_api.h"
 
 #include <algorithm>
 #include <cctype>
 #include <iterator>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/download/download_file_icon_extractor.h"
 #include "chrome/browser/download/download_query.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/icon_loader.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
+#include "chrome/common/extensions/api/downloads.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_save_info.h"
+#include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::DownloadId;
 using content::DownloadItem;
 using content::DownloadManager;
+using extensions::api::downloads::HeaderNameValuePair;
 
 namespace download_extension_errors {
 
 // Error messages
 const char kGenericError[] = "I'm afraid I can't do that.";
 const char kIconNotFoundError[] = "Icon not found.";
 const char kInvalidDangerTypeError[] = "Invalid danger type";
 const char kInvalidFilterError[] = "Invalid query filter";
 const char kInvalidOperationError[] = "Invalid operation.";
 const char kInvalidOrderByError[] = "Invalid orderBy field";
@@ skipping 45 matching lines @@
 const char kStateInProgress[] = "in_progress";
 const char kStateInterrupted[] = "interrupted";
 const char kStateKey[] = "state";
 const char kTotalBytesKey[] = "totalBytes";
 const char kTotalBytesGreaterKey[] = "totalBytesGreater";
 const char kTotalBytesLessKey[] = "totalBytesLess";
 const char kUrlKey[] = "url";
 const char kUrlRegexKey[] = "urlRegex";
 
 // Note: Any change to the danger type strings, should be accompanied by a
-// corresponding change to {experimental.}downloads.json.
+// corresponding change to downloads.idl.
 const char* kDangerStrings[] = {
   kDangerSafe,
   kDangerFile,
   kDangerUrl,
   kDangerContent,
   kDangerSafe,
   kDangerUncommon,
 };
 COMPILE_ASSERT(arraysize(kDangerStrings) == content::DOWNLOAD_DANGER_TYPE_MAX,
                download_danger_type_enum_changed);
 
 // Note: Any change to the state strings, should be accompanied by a
-// corresponding change to {experimental.}downloads.json.
+// corresponding change to downloads.idl.
 const char* kStateStrings[] = {
   kStateInProgress,
   kStateComplete,
   kStateInterrupted,
   NULL,
   kStateInterrupted,
 };
 COMPILE_ASSERT(arraysize(kStateStrings) == DownloadItem::MAX_DOWNLOAD_STATE,
                download_item_state_enum_changed);
 
@@ skipping 171 matching lines @@
     bool include_incognito,
     DownloadManager** manager, DownloadManager** incognito_manager) {
   *manager = DownloadServiceFactory::GetForProfile(profile)->
       GetDownloadManager();
   *incognito_manager = NULL;
   if (include_incognito && profile->HasOffTheRecordProfile())
     *incognito_manager = DownloadServiceFactory::GetForProfile(profile->
         GetOffTheRecordProfile())->GetDownloadManager();
 }
 
-DownloadItem* GetActiveItemInternal(
+DownloadItem* GetActiveItem(
     Profile* profile,
     bool include_incognito,
     int id) {
   DownloadManager* manager = NULL;
   DownloadManager* incognito_manager = NULL;
   GetManagers(profile, include_incognito, &manager, &incognito_manager);
   DownloadItem* download_item = manager->GetActiveDownloadItem(id);
   if (!download_item && incognito_manager)
     download_item = incognito_manager->GetActiveDownloadItem(id);
   return download_item;
 }
 
+enum DownloadsFunctionName {
+  DOWNLOADS_FUNCTION_DOWNLOAD = 0,
+  DOWNLOADS_FUNCTION_SEARCH = 1,
+  DOWNLOADS_FUNCTION_PAUSE = 2,
+  DOWNLOADS_FUNCTION_RESUME = 3,
+  DOWNLOADS_FUNCTION_CANCEL = 4,
+  DOWNLOADS_FUNCTION_ERASE = 5,
+  DOWNLOADS_FUNCTION_SET_DESTINATION = 6,
+  DOWNLOADS_FUNCTION_ACCEPT_DANGER = 7,
+  DOWNLOADS_FUNCTION_SHOW = 8,
+  DOWNLOADS_FUNCTION_DRAG = 9,
+  DOWNLOADS_FUNCTION_GET_FILE_ICON = 10,
+  DOWNLOADS_FUNCTION_OPEN = 11,
+  // Insert new values here, not at the beginning.
+  DOWNLOADS_FUNCTION_LAST
+};
+
+void RecordApiFunctions(DownloadsFunctionName function) {
+  UMA_HISTOGRAM_ENUMERATION("Download.ApiFunctions",
+                            function,
+                            DOWNLOADS_FUNCTION_LAST);
+}
+
+void CompileDownloadQueryOrderBy(
+    const std::string& order_by_str, std::string* error, DownloadQuery* query) {
+  static base::LazyInstance<SortTypeMap> sorter_types =
+    LAZY_INSTANCE_INITIALIZER;
+  if (sorter_types.Get().size() == 0)
+    InitSortTypeMap(sorter_types.Get());
+
+  std::vector<std::string> order_by_strs;
+  base::SplitString(order_by_str, ' ', &order_by_strs);
+  for (std::vector<std::string>::const_iterator iter = order_by_strs.begin();
+      iter != order_by_strs.end(); ++iter) {
+    std::string term_str = *iter;
+    if (term_str.empty())
+      continue;
+    DownloadQuery::SortDirection direction = DownloadQuery::ASCENDING;
+    if (term_str[0] == '-') {
+      direction = DownloadQuery::DESCENDING;
+      term_str = term_str.substr(1);
+    }
+    SortTypeMap::const_iterator sorter_type =
+        sorter_types.Get().find(term_str);
+    if (sorter_type == sorter_types.Get().end()) {
+      *error = download_extension_errors::kInvalidOrderByError;
+      return;
+    }
+    query->AddSorter(sorter_type->second, direction);
+  }
+}
+
+void RunDownloadQuery(
+    const extensions::api::downloads::DownloadQuery& query_in,
+    Profile* profile,
+    bool include_incognito,
+    std::string* error,
+    DownloadQuery::DownloadVector* results) {
+  static base::LazyInstance<FilterTypeMap> filter_types =
+    LAZY_INSTANCE_INITIALIZER;
+  if (filter_types.Get().size() == 0)
+    InitFilterTypeMap(filter_types.Get());
+
+  DownloadQuery query_out;
+
+  if (query_in.limit.get()) {
+    if (*query_in.limit.get() < 0) {
+      *error = download_extension_errors::kInvalidQueryLimit;
+      return;
+    }
+    query_out.Limit(*query_in.limit.get());
+  }
+  if (query_in.state.get()) {
+    DownloadItem::DownloadState state = StateEnumFromString(
+        *query_in.state.get());
+    if (state == DownloadItem::MAX_DOWNLOAD_STATE) {
+      *error = download_extension_errors::kInvalidStateError;
+      return;
+    }
+    query_out.AddFilter(state);
+  }
+  if (query_in.danger.get()) {
+    content::DownloadDangerType danger_type =
+        DangerEnumFromString(*query_in.danger.get());
+    if (danger_type == content::DOWNLOAD_DANGER_TYPE_MAX) {
+      *error = download_extension_errors::kInvalidDangerTypeError;
+      return;
+    }
+    query_out.AddFilter(danger_type);
+  }
+  if (query_in.order_by.get()) {
+    CompileDownloadQueryOrderBy(*query_in.order_by.get(), error, &query_out);
+    if (!error->empty())
+      return;
+  }
+
+  scoped_ptr<base::DictionaryValue> query_in_value(query_in.ToValue().Pass());
+  for (base::DictionaryValue::Iterator query_json_field(*query_in_value.get());
+       query_json_field.HasNext(); query_json_field.Advance()) {
+    FilterTypeMap::const_iterator filter_type =
+        filter_types.Get().find(query_json_field.key());
+    if (filter_type != filter_types.Get().end()) {
+      if (!query_out.AddFilter(filter_type->second, query_json_field.value())) {
+        *error = download_extension_errors::kInvalidFilterError;
+        return;
+      }
+    }
+  }
+
+  DownloadManager* manager = NULL;
+  DownloadManager* incognito_manager = NULL;
+  GetManagers(profile, include_incognito, &manager, &incognito_manager);
+  DownloadQuery::DownloadVector all_items;
+  if (query_in.id.get()) {
+    DownloadItem* item = manager->GetDownloadItem(*query_in.id.get());
+    if (!item && incognito_manager)
+      item = incognito_manager->GetDownloadItem(*query_in.id.get());
+    if (item)
+      all_items.push_back(item);
+  } else {
+    manager->GetAllDownloads(FilePath(FILE_PATH_LITERAL("")), &all_items);
+    if (incognito_manager)
+      incognito_manager->GetAllDownloads(
+          FilePath(FILE_PATH_LITERAL("")), &all_items);
+  }
+  query_out.Search(all_items.begin(), all_items.end(), results);
+}
+
 }  // namespace
 
-bool DownloadsFunctionInterface::RunImplImpl(
-    DownloadsFunctionInterface* pimpl) {
-  CHECK(pimpl);
-  if (!pimpl->ParseArgs()) return false;
-  UMA_HISTOGRAM_ENUMERATION(
-      "Download.ApiFunctions", pimpl->function(), DOWNLOADS_FUNCTION_LAST);
-  return pimpl->RunInternal();
-}
-
-SyncDownloadsFunction::SyncDownloadsFunction(
-    DownloadsFunctionInterface::DownloadsFunctionName function)
-  : function_(function) {
-}
-
-SyncDownloadsFunction::~SyncDownloadsFunction() {}
-
-bool SyncDownloadsFunction::RunImpl() {
-  return DownloadsFunctionInterface::RunImplImpl(this);
-}
-
-DownloadsFunctionInterface::DownloadsFunctionName
-SyncDownloadsFunction::function() const {
-  return function_;
-}
-
-DownloadItem* SyncDownloadsFunction::GetActiveItem(int download_id) {
-  return GetActiveItemInternal(profile(), include_incognito(), download_id);
-}
-
-AsyncDownloadsFunction::AsyncDownloadsFunction(
-    DownloadsFunctionInterface::DownloadsFunctionName function)
-  : function_(function) {
-}
-
-AsyncDownloadsFunction::~AsyncDownloadsFunction() {}
-
-bool AsyncDownloadsFunction::RunImpl() {
-  return DownloadsFunctionInterface::RunImplImpl(this);
-}
-
-DownloadsFunctionInterface::DownloadsFunctionName
-AsyncDownloadsFunction::function() const {
-  return function_;
-}
-
-DownloadItem* AsyncDownloadsFunction::GetActiveItem(int download_id) {
-  return GetActiveItemInternal(profile(), include_incognito(), download_id);
-}
-
-DownloadsDownloadFunction::DownloadsDownloadFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_DOWNLOAD) {
-}
-
+DownloadsDownloadFunction::DownloadsDownloadFunction() {}
 DownloadsDownloadFunction::~DownloadsDownloadFunction() {}
 
-DownloadsDownloadFunction::IOData::IOData()
-  : save_as(false),
-    extra_headers(NULL),
-    method("GET"),
-    rdh(NULL),
-    resource_context(NULL),
-    render_process_host_id(0),
-    render_view_host_routing_id(0) {
-}
-
-DownloadsDownloadFunction::IOData::~IOData() {}
-
-bool DownloadsDownloadFunction::ParseArgs() {
-  base::DictionaryValue* options = NULL;
-  std::string url;
-  iodata_.reset(new IOData());
-  EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &options));
-  EXTENSION_FUNCTION_VALIDATE(options->GetString(kUrlKey, &url));
-  iodata_->url = GURL(url);
-  if (!iodata_->url.is_valid()) {
+bool DownloadsDownloadFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Download::Params> params(
+      extensions::api::downloads::Download::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_DOWNLOAD);
+  const extensions::api::downloads::DownloadOptions& options = params->options;
+
+  GURL url(options.url);
+  if (!url.is_valid() ||
+      (!url.SchemeIs("data") &&
+       url.GetOrigin() != GetExtension()->url().GetOrigin() &&
+       !GetExtension()->HasHostPermission(url))) {
     error_ = download_extension_errors::kInvalidURLError;
     return false;
   }
 
-  if (!iodata_->url.SchemeIs("data") &&
-      iodata_->url.GetOrigin() != GetExtension()->url().GetOrigin() &&
-      !GetExtension()->HasHostPermission(iodata_->url)) {
-    error_ = download_extension_errors::kInvalidURLError;
-    return false;
-  }
-
-  if (options->HasKey(kFilenameKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options->GetString(
-        kFilenameKey, &iodata_->filename));
-    if (!ValidateFilename(iodata_->filename)) {
+  content::DownloadSaveInfo save_info;
+  if (options.filename.get()) {
+    // TODO(benjhayden): Make json_schema_compiler generate string16s instead of
+    // std::strings. Can't get filename16 from options.ToValue() because that
+    // converts it from std::string.
+    base::DictionaryValue* options_value = NULL;
+    EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &options_value));
+    string16 filename16;
+    EXTENSION_FUNCTION_VALIDATE(options_value->GetString(
+        kFilenameKey, &filename16));
+    if (!ValidateFilename(filename16)) {
       error_ = download_extension_errors::kGenericError;
       return false;
     }
-  }
-
-  if (options->HasKey(kSaveAsKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options->GetBoolean(
-        kSaveAsKey, &iodata_->save_as));
-  }
-
-  if (options->HasKey(kMethodKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options->GetString(
-        kMethodKey, &iodata_->method));
-  }
-
-  // It's ok to use a pointer to extra_headers without DeepCopy()ing because
-  // |args_| (which owns *extra_headers) is guaranteed to live as long as
-  // |this|.
-  if (options->HasKey(kHeadersKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options->GetList(
-        kHeadersKey, &iodata_->extra_headers));
-  }
-
-  if (options->HasKey(kBodyKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options->GetString(
-        kBodyKey, &iodata_->post_body));
-  }
-
-  if (iodata_->extra_headers != NULL) {
-    for (size_t index = 0; index < iodata_->extra_headers->GetSize(); ++index) {
-      base::DictionaryValue* header = NULL;
-      std::string name;
-      EXTENSION_FUNCTION_VALIDATE(iodata_->extra_headers->GetDictionary(
-            index, &header));
-      EXTENSION_FUNCTION_VALIDATE(header->GetString(
-            kHeaderNameKey, &name));
-      if (header->HasKey(kHeaderBinaryValueKey)) {
-        base::ListValue* binary_value = NULL;
-        EXTENSION_FUNCTION_VALIDATE(header->GetList(
-              kHeaderBinaryValueKey, &binary_value));
-        for (size_t char_i = 0; char_i < binary_value->GetSize(); ++char_i) {
-          int char_value = 0;
-          EXTENSION_FUNCTION_VALIDATE(binary_value->GetInteger(
-                char_i, &char_value));
-        }
-      } else if (header->HasKey(kHeaderValueKey)) {
-        std::string value;
-        EXTENSION_FUNCTION_VALIDATE(header->GetString(
-              kHeaderValueKey, &value));
-      }
-      if (!net::HttpUtil::IsSafeHeader(name)) {
+    // TODO(benjhayden) Ensure that this filename is interpreted as a path
+    // relative to the default downloads directory without allowing '..'.
+    save_info.suggested_name = filename16;
+  }
+
+  if (options.save_as.get())
+    save_info.prompt_for_save_location = *options.save_as.get();
+
+  Profile* current_profile = profile();
+  if (include_incognito() && profile()->HasOffTheRecordProfile())
+    current_profile = profile()->GetOffTheRecordProfile();
+  // TODO XXX test incognito download()
+
+  scoped_ptr<content::DownloadUrlParameters> download_params(
+      new content::DownloadUrlParameters(
+          url,
+          render_view_host()->GetProcess()->GetID(),
+          render_view_host()->GetRoutingID(),
+          current_profile->GetResourceContext(),
+          save_info));
+
+  if (options.headers.get()) {
+    for (std::vector<linked_ptr<HeaderNameValuePair> >::const_iterator iter =
+         options.headers->begin();
+         iter != options.headers->end();
+         ++iter) {
+      const HeaderNameValuePair& name_value = **iter;
+      if (!net::HttpUtil::IsSafeHeader(name_value.name)) {
         error_ = download_extension_errors::kGenericError;
         return false;
       }
-    }
-  }
-  iodata_->rdh = content::ResourceDispatcherHost::Get();
-  iodata_->resource_context = profile()->GetResourceContext();
-  iodata_->render_process_host_id = render_view_host()->GetProcess()->GetID();
-  iodata_->render_view_host_routing_id = render_view_host()->GetRoutingID();
+      std::string value;
+      if (name_value.binary_value.get()) {
+        for (size_t char_i = 0;
+             char_i < name_value.binary_value->size();
+             ++char_i) {
+          value.push_back((*name_value.binary_value.get())[char_i]);
+        }
+      } else if (name_value.value.get()) {
+        value = *name_value.value.get();
+      }
+      download_params->add_request_header(name_value.name, value);
+    }
+  }
+
+  if (options.method.get())
+    download_params->set_method(*options.method.get());
+  if (options.body.get())
+    download_params->set_post_body(*options.body.get());
+  download_params->set_callback(base::Bind(
+      &DownloadsDownloadFunction::OnStarted, this));
+  // Prevent login prompts for 401/407 responses.
+  download_params->set_load_flags(net::LOAD_DO_NOT_PROMPT_FOR_LOGIN);
+
+  DownloadManager* manager = DownloadServiceFactory::GetForProfile(
+      current_profile)->GetDownloadManager();
+  manager->DownloadUrl(download_params.Pass());
   return true;
 }
 
-bool DownloadsDownloadFunction::RunInternal() {
-  VLOG(1) << __FUNCTION__ << " " << iodata_->url.spec();
-  if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(
-          &DownloadsDownloadFunction::BeginDownloadOnIOThread, this))) {
-    error_ = download_extension_errors::kGenericError;
-    return false;
-  }
-  return true;
-}
-
-void DownloadsDownloadFunction::BeginDownloadOnIOThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DVLOG(1) << __FUNCTION__ << " " << iodata_->url.spec();
-  content::DownloadSaveInfo save_info;
-  // TODO(benjhayden) Ensure that this filename is interpreted as a path
-  // relative to the default downloads directory without allowing '..'.
-  save_info.suggested_name = iodata_->filename;
-  save_info.prompt_for_save_location = iodata_->save_as;
-
-  scoped_ptr<net::URLRequest> request(new net::URLRequest(iodata_->url, NULL));
-  request->set_method(iodata_->method);
-  if (iodata_->extra_headers != NULL) {
-    for (size_t index = 0; index < iodata_->extra_headers->GetSize(); ++index) {
-      base::DictionaryValue* header = NULL;
-      std::string name, value;
-      CHECK(iodata_->extra_headers->GetDictionary(index, &header));
-      CHECK(header->GetString(kHeaderNameKey, &name));
-      if (header->HasKey(kHeaderBinaryValueKey)) {
-        base::ListValue* binary_value = NULL;
-        CHECK(header->GetList(kHeaderBinaryValueKey, &binary_value));
-        for (size_t char_i = 0; char_i < binary_value->GetSize(); ++char_i) {
-          int char_value = 0;
-          CHECK(binary_value->GetInteger(char_i, &char_value));
-          if ((0 <= char_value) &&
-              (char_value <= 0xff)) {
-            value.push_back(char_value);
-          }
-        }
-      } else if (header->HasKey(kHeaderValueKey)) {
-        CHECK(header->GetString(kHeaderValueKey, &value));
-      }
-      request->SetExtraRequestHeaderByName(name, value, false/*overwrite*/);
-    }
-  }
-  if (!iodata_->post_body.empty()) {
-    request->AppendBytesToUpload(iodata_->post_body.data(),
-                                 iodata_->post_body.size());
-  }
-
-  // Prevent login prompts for 401/407 responses.
-  request->set_load_flags(request->load_flags() |
-                          net::LOAD_DO_NOT_PROMPT_FOR_LOGIN);
-
-  net::Error error = iodata_->rdh->BeginDownload(
-      request.Pass(),
-      false,  // is_content_initiated
-      iodata_->resource_context,
-      iodata_->render_process_host_id,
-      iodata_->render_view_host_routing_id,
-      false,  // prefer_cache
-      save_info,
-      base::Bind(&DownloadsDownloadFunction::OnStarted, this));
-  iodata_.reset();
-
-  if (error != net::OK) {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&DownloadsDownloadFunction::OnStarted, this,
-                   DownloadId::Invalid(), error));
-  }
-}
-
 void DownloadsDownloadFunction::OnStarted(DownloadId dl_id, net::Error error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   VLOG(1) << __FUNCTION__ << " " << dl_id << " " << error;
   if (dl_id.local() >= 0) {
     result_.reset(base::Value::CreateIntegerValue(dl_id.local()));
   } else {
     error_ = net::ErrorToString(error);
   }
   SendResponse(error_.empty());
 }
 
-DownloadsSearchFunction::DownloadsSearchFunction()
-  : SyncDownloadsFunction(DOWNLOADS_FUNCTION_SEARCH),
-    query_(new DownloadQuery()),
-    get_id_(0),
-    has_get_id_(false) {
-}
-
+DownloadsSearchFunction::DownloadsSearchFunction() {}
 DownloadsSearchFunction::~DownloadsSearchFunction() {}
 
-bool DownloadsSearchFunction::ParseArgs() {
-  static base::LazyInstance<FilterTypeMap> filter_types =
-    LAZY_INSTANCE_INITIALIZER;
-  if (filter_types.Get().size() == 0)
-    InitFilterTypeMap(filter_types.Get());
-
-  base::DictionaryValue* query_json = NULL;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &query_json));
-  for (base::DictionaryValue::Iterator query_json_field(*query_json);
-       query_json_field.HasNext(); query_json_field.Advance()) {
-    FilterTypeMap::const_iterator filter_type =
-        filter_types.Get().find(query_json_field.key());
-
-    if (filter_type != filter_types.Get().end()) {
-      if (!query_->AddFilter(filter_type->second, query_json_field.value())) {
-        error_ = download_extension_errors::kInvalidFilterError;
-        return false;
-      }
-    } else if (query_json_field.key() == kIdKey) {
-      EXTENSION_FUNCTION_VALIDATE(query_json_field.value().GetAsInteger(
-          &get_id_));
-      has_get_id_ = true;
-    } else if (query_json_field.key() == kOrderByKey) {
-      if (!ParseOrderBy(query_json_field.value()))
-        return false;
-    } else if (query_json_field.key() == kDangerKey) {
-      std::string danger_str;
-      EXTENSION_FUNCTION_VALIDATE(query_json_field.value().GetAsString(
-          &danger_str));
-      content::DownloadDangerType danger_type =
-          DangerEnumFromString(danger_str);
-      if (danger_type == content::DOWNLOAD_DANGER_TYPE_MAX) {
-        error_ = download_extension_errors::kInvalidDangerTypeError;
-        return false;
-      }
-      query_->AddFilter(danger_type);
-    } else if (query_json_field.key() == kStateKey) {
-      std::string state_str;
-      EXTENSION_FUNCTION_VALIDATE(query_json_field.value().GetAsString(
-          &state_str));
-      DownloadItem::DownloadState state = StateEnumFromString(state_str);
-      if (state == DownloadItem::MAX_DOWNLOAD_STATE) {
-        error_ = download_extension_errors::kInvalidStateError;
-        return false;
-      }
-      query_->AddFilter(state);
-    } else if (query_json_field.key() == kLimitKey) {
-      int limit = 0;
-      EXTENSION_FUNCTION_VALIDATE(query_json_field.value().GetAsInteger(
-          &limit));
-      if (limit < 0) {
-        error_ = download_extension_errors::kInvalidQueryLimit;
-        return false;
-      }
-      query_->Limit(limit);
-    } else {
-      EXTENSION_FUNCTION_VALIDATE(false);
-    }
-  }
-  return true;
-}
-
-bool DownloadsSearchFunction::ParseOrderBy(const base::Value& order_by_value) {
-  static base::LazyInstance<SortTypeMap> sorter_types =
-    LAZY_INSTANCE_INITIALIZER;
-  if (sorter_types.Get().size() == 0)
-    InitSortTypeMap(sorter_types.Get());
-
-  std::string order_by_str;
-  EXTENSION_FUNCTION_VALIDATE(order_by_value.GetAsString(&order_by_str));
-  std::vector<std::string> order_by_strs;
-  base::SplitString(order_by_str, ' ', &order_by_strs);
-  for (std::vector<std::string>::const_iterator iter = order_by_strs.begin();
-      iter != order_by_strs.end(); ++iter) {
-    std::string term_str = *iter;
-    if (term_str.empty())
-      continue;
-    DownloadQuery::SortDirection direction = DownloadQuery::ASCENDING;
-    if (term_str[0] == '-') {
-      direction = DownloadQuery::DESCENDING;
-      term_str = term_str.substr(1);
-    }
-    SortTypeMap::const_iterator sorter_type =
-        sorter_types.Get().find(term_str);
-    if (sorter_type == sorter_types.Get().end()) {
-      error_ = download_extension_errors::kInvalidOrderByError;
-      return false;
-    }
-    query_->AddSorter(sorter_type->second, direction);
-  }
-  return true;
-}
-
-bool DownloadsSearchFunction::RunInternal() {
-  DownloadManager* manager = NULL;
-  DownloadManager* incognito_manager = NULL;
-  GetManagers(profile(), include_incognito(), &manager, &incognito_manager);
-  DownloadQuery::DownloadVector all_items, cpp_results;
-  if (has_get_id_) {
-    DownloadItem* item = manager->GetDownloadItem(get_id_);
-    if (!item && incognito_manager)
-      item = incognito_manager->GetDownloadItem(get_id_);
-    if (item)
-      all_items.push_back(item);
-  } else {
-    manager->GetAllDownloads(FilePath(FILE_PATH_LITERAL("")), &all_items);
-    if (incognito_manager)
-      incognito_manager->GetAllDownloads(
-          FilePath(FILE_PATH_LITERAL("")), &all_items);
-  }
-  query_->Search(all_items.begin(), all_items.end(), &cpp_results);
+bool DownloadsSearchFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Search::Params> params(
+      extensions::api::downloads::Search::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_SEARCH);
+  DownloadQuery::DownloadVector results;
+  RunDownloadQuery(params->query, profile(), include_incognito(),
+                   &error_, &results);
+  if (!error_.empty())
+    return false;
   base::ListValue* json_results = new base::ListValue();
-  for (DownloadManager::DownloadVector::const_iterator it = cpp_results.begin();
-       it != cpp_results.end(); ++it) {
+  for (DownloadManager::DownloadVector::const_iterator it = results.begin();
+       it != results.end(); ++it) {
     scoped_ptr<base::DictionaryValue> item(DownloadItemToJSON(*it));
     json_results->Append(item.release());
   }
   result_.reset(json_results);
   return true;
 }
 
-DownloadsPauseFunction::DownloadsPauseFunction()
-  : SyncDownloadsFunction(DOWNLOADS_FUNCTION_PAUSE),
-    download_id_(DownloadId::Invalid().local()) {
-}
-
+DownloadsPauseFunction::DownloadsPauseFunction() {}
 DownloadsPauseFunction::~DownloadsPauseFunction() {}
 
-bool DownloadsPauseFunction::ParseArgs() {
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &download_id_));
-  return true;
-}
-
-bool DownloadsPauseFunction::RunInternal() {
-  DownloadItem* download_item = GetActiveItem(download_id_);
+bool DownloadsPauseFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Pause::Params> params(
+      extensions::api::downloads::Pause::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_PAUSE);
+  DownloadItem* download_item = GetActiveItem(
+      profile(), include_incognito(), params->download_id);
   if ((download_item == NULL) || !download_item->IsInProgress()) {
     // This could be due to an invalid download ID, or it could be due to the
     // download not being currently active.
     error_ = download_extension_errors::kInvalidOperationError;
   } else if (!download_item->IsPaused()) {
     // If download_item->IsPaused() already then we treat it as a success.
     download_item->TogglePause();
   }
   return error_.empty();
 }
 
-DownloadsResumeFunction::DownloadsResumeFunction()
-  : SyncDownloadsFunction(DOWNLOADS_FUNCTION_RESUME),
-    download_id_(DownloadId::Invalid().local()) {
-}
-
+DownloadsResumeFunction::DownloadsResumeFunction() {}
 DownloadsResumeFunction::~DownloadsResumeFunction() {}
 
-bool DownloadsResumeFunction::ParseArgs() {
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &download_id_));
-  return true;
-}
-
-bool DownloadsResumeFunction::RunInternal() {
-  DownloadItem* download_item = GetActiveItem(download_id_);
+bool DownloadsResumeFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Resume::Params> params(
+      extensions::api::downloads::Resume::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_RESUME);
+  DownloadItem* download_item = GetActiveItem(
+      profile(), include_incognito(), params->download_id);
   if (download_item == NULL) {
     // This could be due to an invalid download ID, or it could be due to the
     // download not being currently active.
     error_ = download_extension_errors::kInvalidOperationError;
   } else if (download_item->IsPaused()) {
     // If !download_item->IsPaused() already, then we treat it as a success.
     download_item->TogglePause();
   }
   return error_.empty();
 }
 
-DownloadsCancelFunction::DownloadsCancelFunction()
-  : SyncDownloadsFunction(DOWNLOADS_FUNCTION_CANCEL),
-    download_id_(DownloadId::Invalid().local()) {
-}
-
+DownloadsCancelFunction::DownloadsCancelFunction() {}
 DownloadsCancelFunction::~DownloadsCancelFunction() {}
 
-bool DownloadsCancelFunction::ParseArgs() {
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &download_id_));
-  return true;
-}
-
-bool DownloadsCancelFunction::RunInternal() {
-  DownloadItem* download_item = GetActiveItem(download_id_);
+bool DownloadsCancelFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Resume::Params> params(
+      extensions::api::downloads::Resume::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_CANCEL);
+  DownloadItem* download_item = GetActiveItem(
+      profile(), include_incognito(), params->download_id);
   if (download_item != NULL)
     download_item->Cancel(true);
   // |download_item| can be NULL if the download ID was invalid or if the
   // download is not currently active.  Either way, we don't consider it a
   // failure.
   return error_.empty();
 }
 
-DownloadsEraseFunction::DownloadsEraseFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_ERASE) {
+DownloadsEraseFunction::DownloadsEraseFunction() {}
+DownloadsEraseFunction::~DownloadsEraseFunction() {}
+
+bool DownloadsEraseFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Erase::Params> params(
+      extensions::api::downloads::Erase::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_ERASE);
+  error_ = download_extension_errors::kNotImplementedError;
+  return error_.empty();
 }
 
-DownloadsEraseFunction::~DownloadsEraseFunction() {}
+DownloadsSetDestinationFunction::DownloadsSetDestinationFunction() {}
+DownloadsSetDestinationFunction::~DownloadsSetDestinationFunction() {}
 
-bool DownloadsEraseFunction::ParseArgs() {
-  base::DictionaryValue* query_json = NULL;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &query_json));
+bool DownloadsSetDestinationFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::SetDestination::Params> params(
+      extensions::api::downloads::SetDestination::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_SET_DESTINATION);
   error_ = download_extension_errors::kNotImplementedError;
-  return false;
+  return error_.empty();
 }
 
-bool DownloadsEraseFunction::RunInternal() {
-  NOTIMPLEMENTED();
-  return false;
+DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction() {}
+DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
+
+bool DownloadsAcceptDangerFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::AcceptDanger::Params> params(
+      extensions::api::downloads::AcceptDanger::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
+  error_ = download_extension_errors::kNotImplementedError;
+  return error_.empty();
 }
 
-DownloadsSetDestinationFunction::DownloadsSetDestinationFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_SET_DESTINATION) {
+DownloadsShowFunction::DownloadsShowFunction() {}
+DownloadsShowFunction::~DownloadsShowFunction() {}
+
+bool DownloadsShowFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Show::Params> params(
+      extensions::api::downloads::Show::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_SHOW);
+  error_ = download_extension_errors::kNotImplementedError;
+  return error_.empty();
 }
 
-DownloadsSetDestinationFunction::~DownloadsSetDestinationFunction() {}
+DownloadsOpenFunction::DownloadsOpenFunction() {}
+DownloadsOpenFunction::~DownloadsOpenFunction() {}
 
-bool DownloadsSetDestinationFunction::ParseArgs() {
-  int dl_id = 0;
-  std::string path;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &dl_id));
-  EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &path));
-  VLOG(1) << __FUNCTION__ << " " << dl_id << " " << &path;
+bool DownloadsOpenFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Open::Params> params(
+      extensions::api::downloads::Open::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_OPEN);
   error_ = download_extension_errors::kNotImplementedError;
-  return false;
+  return error_.empty();
 }
 
-bool DownloadsSetDestinationFunction::RunInternal() {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-DownloadsAcceptDangerFunction::DownloadsAcceptDangerFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_ACCEPT_DANGER) {
-}
-
-DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
-
-bool DownloadsAcceptDangerFunction::ParseArgs() {
-  int dl_id = 0;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &dl_id));
-  VLOG(1) << __FUNCTION__ << " " << dl_id;
-  error_ = download_extension_errors::kNotImplementedError;
-  return false;
-}
-
-bool DownloadsAcceptDangerFunction::RunInternal() {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-DownloadsShowFunction::DownloadsShowFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_SHOW) {
-}
-
-DownloadsShowFunction::~DownloadsShowFunction() {}
-
-bool DownloadsShowFunction::ParseArgs() {
-  int dl_id = 0;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &dl_id));
-  VLOG(1) << __FUNCTION__ << " " << dl_id;
-  error_ = download_extension_errors::kNotImplementedError;
-  return false;
-}
-
-bool DownloadsShowFunction::RunInternal() {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-DownloadsDragFunction::DownloadsDragFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_DRAG) {
-}
-
+DownloadsDragFunction::DownloadsDragFunction() {}
 DownloadsDragFunction::~DownloadsDragFunction() {}
 
-bool DownloadsDragFunction::ParseArgs() {
-  int dl_id = 0;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &dl_id));
-  VLOG(1) << __FUNCTION__ << " " << dl_id;
+bool DownloadsDragFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::Drag::Params> params(
+      extensions::api::downloads::Drag::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  RecordApiFunctions(DOWNLOADS_FUNCTION_DRAG);
   error_ = download_extension_errors::kNotImplementedError;
-  return false;
-}
-
-bool DownloadsDragFunction::RunInternal() {
-  NOTIMPLEMENTED();
-  return false;
+  return error_.empty();
 }
 
 DownloadsGetFileIconFunction::DownloadsGetFileIconFunction()
-  : AsyncDownloadsFunction(DOWNLOADS_FUNCTION_GET_FILE_ICON),
-    icon_size_(kDefaultIconSize),
-    icon_extractor_(new DownloadFileIconExtractorImpl()) {
+  : icon_extractor_(new DownloadFileIconExtractorImpl()) {
 }
 
 DownloadsGetFileIconFunction::~DownloadsGetFileIconFunction() {}
 
 void DownloadsGetFileIconFunction::SetIconExtractorForTesting(
     DownloadFileIconExtractor* extractor) {
   DCHECK(extractor);
   icon_extractor_.reset(extractor);
 }
 
-bool DownloadsGetFileIconFunction::ParseArgs() {
-  int dl_id = 0;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &dl_id));
-
-  base::DictionaryValue* options = NULL;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &options));
-  if (options->HasKey(kSizeKey)) {
-    EXTENSION_FUNCTION_VALIDATE(options->GetInteger(kSizeKey, &icon_size_));
-    // We only support 16px and 32px icons. This is enforced in
-    // experimental.downloads.json.
-    DCHECK(icon_size_ == 16 || icon_size_ == 32);
-  }
-
+bool DownloadsGetFileIconFunction::RunImpl() {
+  scoped_ptr<extensions::api::downloads::GetFileIcon::Params> params(
+      extensions::api::downloads::GetFileIcon::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  UMA_HISTOGRAM_ENUMERATION("Download.ApiFunctions",
+                            DOWNLOADS_FUNCTION_GET_FILE_ICON,
+                            DOWNLOADS_FUNCTION_LAST);
+  const extensions::api::downloads::GetFileIconOptions* options =
+      params->options.get();
+  int icon_size = kDefaultIconSize;
+  if (options && options->size.get())
+    icon_size = *options->size.get();
   DownloadManager* manager = NULL;
   DownloadManager* incognito_manager = NULL;
   GetManagers(profile(), include_incognito(), &manager, &incognito_manager);
-  DownloadItem* download_item = manager->GetDownloadItem(dl_id);
+  DownloadItem* download_item = manager->GetDownloadItem(params->download_id);
   if (!download_item && incognito_manager)
-    download_item = incognito_manager->GetDownloadItem(dl_id);
+    download_item = incognito_manager->GetDownloadItem(params->download_id);
   if (!download_item) {
     // The DownloadItem is is added to history when the path is determined. If
     // the download is not in history, then we don't have a path / final
     // filename and no icon.
     error_ = download_extension_errors::kInvalidOperationError;
     return false;
   }
   // In-progress downloads return the intermediate filename for GetFullPath()
   // which doesn't have the final extension. Therefore we won't be able to
   // derive a good file icon for it. So we use GetTargetFilePath() instead.
-  path_ = download_item->GetTargetFilePath();
-  DCHECK(!path_.empty());
-  return true;
-}
-
-bool DownloadsGetFileIconFunction::RunInternal() {
-  DCHECK(!path_.empty());
+  FilePath path = download_item->GetTargetFilePath();
+  DCHECK(!path.empty());
   DCHECK(icon_extractor_.get());
+  DCHECK(icon_size == 16 || icon_size == 32);
   EXTENSION_FUNCTION_VALIDATE(icon_extractor_->ExtractIconURLForPath(
-      path_, IconLoaderSizeFromPixelSize(icon_size_),
+      path, IconLoaderSizeFromPixelSize(icon_size),
       base::Bind(&DownloadsGetFileIconFunction::OnIconURLExtracted, this)));
   return true;
 }
 
 void DownloadsGetFileIconFunction::OnIconURLExtracted(const std::string& url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (url.empty())
     error_ = download_extension_errors::kIconNotFoundError;
   else
     result_.reset(base::Value::CreateStringValue(url));
@@ skipping 74 matching lines @@
   // set the differences in the |delta| object and remember that something
   // significant changed.
   for (base::DictionaryValue::Iterator iter(*new_json.get());
        iter.HasNext(); iter.Advance()) {
     new_fields.insert(iter.key());
     if (iter.key() != kBytesReceivedKey) {
       base::Value* old_value = NULL;
       if (!old_json->HasKey(iter.key()) ||
           (old_json->Get(iter.key(), &old_value) &&
            !iter.value().Equals(old_value))) {
-        delta->Set(iter.key() + ".new", iter.value().DeepCopy());
+        delta->Set(iter.key() + ".current", iter.value().DeepCopy());
         if (old_value)
-          delta->Set(iter.key() + ".old", old_value->DeepCopy());
+          delta->Set(iter.key() + ".previous", old_value->DeepCopy());
         changed = true;
       }
     }
   }
 
   // If a field was in the previous json but is not in the new json, set the
   // difference in |delta|.
   for (base::DictionaryValue::Iterator iter(*old_json);
        iter.HasNext(); iter.Advance()) {
     if (new_fields.find(iter.key()) == new_fields.end()) {
-      delta->Set(iter.key() + ".old", iter.value().DeepCopy());
+      delta->Set(iter.key() + ".previous", iter.value().DeepCopy());
       changed = true;
     }
   }
 
   // Update the OnChangedStat and dispatch the event if something significant
   // changed. Replace the stored json with the new json.
   ++(on_changed_stats_[download_id]->total);
   if (changed) {
     DispatchEvent(extension_event_names::kOnDownloadChanged, delta.release());
     ++(on_changed_stats_[download_id]->fires);
@@ skipping 68 matching lines @@
   ListValue args;
   args.Append(arg);
   std::string json_args;
   base::JSONWriter::Write(&args, &json_args);
   profile_->GetExtensionEventRouter()->DispatchEventToRenderers(
       event_name,
       json_args,
       profile_,
       GURL());
 }