Index: chrome/browser/extensions/api/downloads/downloads_api.cc |
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc |
index 83b0de8a4ece2f99172273c6e6bdc04897c47e7a..8d043471beb06a86da264b24ab9b09ba3b7b4884 100644 |
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc |
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc |
@@ -426,18 +426,25 @@ void RunDownloadQuery( |
} |
query_out.Limit(*query_in.limit.get()); |
} |
- if (query_in.state.get()) { |
- DownloadItem::DownloadState state = StateEnumFromString( |
- *query_in.state.get()); |
+ std::string state_string; |
+ scoped_ptr<base::Value> state_value( |
+ extensions::api::downloads::CreateEnumValue(query_in.state)); |
+ if (state_value.get()) { |
+ state_value->GetAsString(&state_string); |
+ DownloadItem::DownloadState state = StateEnumFromString(state_string); |
not at google - send to devlin
2012/09/14 01:44:51
if you generate a ToString as I suggested, this wo
cduvall
2012/09/17 22:07:46
Done.
|
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()); |
+ std::string danger_string; |
+ scoped_ptr<base::Value> danger_value( |
+ extensions::api::downloads::CreateEnumValue(query_in.danger)); |
+ if (danger_value.get()) { |
+ danger_value->GetAsString(&danger_string); |
+ content::DownloadDangerType danger_type = DangerEnumFromString( |
+ danger_string); |
not at google - send to devlin
2012/09/14 01:44:51
etc
cduvall
2012/09/17 22:07:46
Done.
|
if (danger_type == content::DOWNLOAD_DANGER_TYPE_MAX) { |
*error = download_extension_errors::kInvalidDangerTypeError; |
return; |
@@ -572,10 +579,14 @@ bool DownloadsDownloadFunction::RunImpl() { |
} |
} |
- if (options.method.get()) |
- download_params->set_method(*options.method.get()); |
+ if (options.method != extensions::api::downloads::HTTPMETHOD_NONE) { |
+ std::string method; |
+ extensions::api::downloads::CreateEnumValue(options.method)->GetAsString( |
+ &method); |
+ download_params->set_method(method); |
+ } |
not at google - send to devlin
2012/09/14 01:44:51
etc
cduvall
2012/09/17 22:07:46
Done.
|
if (options.body.get()) |
- download_params->set_post_body(*options.body.get()); |
+ download_params->set_post_body(*options.body); |
benjhayden
2012/09/14 13:17:48
Why remove the .get()? I think it's more explicit
cduvall
2012/09/17 22:07:46
Done.
|
download_params->set_callback(base::Bind( |
&DownloadsDownloadFunction::OnStarted, this)); |
// Prevent login prompts for 401/407 responses. |