| Index: extensions/browser/api/web_request/web_request_api_helpers.cc
|
| diff --git a/extensions/browser/api/web_request/web_request_api_helpers.cc b/extensions/browser/api/web_request/web_request_api_helpers.cc
|
| index 53dfc88655edc29f9a8cf5289df13da868f0d37e..42e425864627107834b048e15a251efadee29f58 100644
|
| --- a/extensions/browser/api/web_request/web_request_api_helpers.cc
|
| +++ b/extensions/browser/api/web_request/web_request_api_helpers.cc
|
| @@ -32,6 +32,7 @@
|
| #include "net/cookies/parsed_cookie.h"
|
| #include "net/http/http_util.h"
|
| #include "net/log/net_log.h"
|
| +#include "net/log/net_log_event_type.h"
|
| #include "net/url_request/url_request.h"
|
| #include "url/url_constants.h"
|
|
|
| @@ -444,7 +445,7 @@ void MergeCancelOfResponses(
|
| if ((*i)->cancel) {
|
| *canceled = true;
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_ABORTED_REQUEST,
|
| + net::NetLogEventType::CHROME_EXTENSION_ABORTED_REQUEST,
|
| CreateNetLogExtensionIdCallback(i->get()));
|
| break;
|
| }
|
| @@ -483,7 +484,7 @@ static bool MergeRedirectUrlOfResponsesHelper(
|
| winning_extension_id = (*delta)->extension_id;
|
| redirected = true;
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_REDIRECTED_REQUEST,
|
| + net::NetLogEventType::CHROME_EXTENSION_REDIRECTED_REQUEST,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| } else {
|
| conflicting_extensions->insert(
|
| @@ -493,7 +494,7 @@ static bool MergeRedirectUrlOfResponsesHelper(
|
| (*delta)->new_url,
|
| *new_url));
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| + net::NetLogEventType::CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| }
|
| }
|
| @@ -819,7 +820,7 @@ void MergeOnBeforeSendHeadersResponses(
|
| }
|
| }
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_MODIFIED_HEADERS,
|
| + net::NetLogEventType::CHROME_EXTENSION_MODIFIED_HEADERS,
|
| base::Bind(&NetLogModificationCallback, delta->get()));
|
| } else {
|
| conflicting_extensions->insert(
|
| @@ -827,7 +828,7 @@ void MergeOnBeforeSendHeadersResponses(
|
| (*delta)->extension_id, winning_extension_id,
|
| conflicting_header));
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| + net::NetLogEventType::CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| }
|
| }
|
| @@ -1152,7 +1153,7 @@ void MergeOnHeadersReceivedResponses(
|
| }
|
| }
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_MODIFIED_HEADERS,
|
| + net::NetLogEventType::CHROME_EXTENSION_MODIFIED_HEADERS,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| } else {
|
| conflicting_extensions->insert(
|
| @@ -1160,7 +1161,7 @@ void MergeOnHeadersReceivedResponses(
|
| (*delta)->extension_id, winning_extension_id,
|
| conflicting_header));
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| + net::NetLogEventType::CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| }
|
| }
|
| @@ -1209,11 +1210,11 @@ bool MergeOnAuthRequiredResponses(
|
| extensions::Warning::CreateCredentialsConflictWarning(
|
| (*delta)->extension_id, winning_extension_id));
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| + net::NetLogEventType::CHROME_EXTENSION_IGNORED_DUE_TO_CONFLICT,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| } else {
|
| net_log->AddEvent(
|
| - net::NetLog::TYPE_CHROME_EXTENSION_PROVIDE_AUTH_CREDENTIALS,
|
| + net::NetLogEventType::CHROME_EXTENSION_PROVIDE_AUTH_CREDENTIALS,
|
| CreateNetLogExtensionIdCallback(delta->get()));
|
| *auth_credentials = *(*delta)->auth_credentials;
|
| credentials_set = true;
|
|
|