| Index: chrome/browser/guest_view/web_view/web_view_guest.cc
|
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| index 2d6bb113edd8300d04b38faa74600d2da56d9bf3..9337d4150676773cb5b457c57347145c536cdb78 100644
|
| --- a/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| @@ -112,9 +112,6 @@ static std::string TerminationStatusToString(base::TerminationStatus status) {
|
| case base::TERMINATION_STATUS_PROCESS_WAS_KILLED:
|
| return "killed";
|
| case base::TERMINATION_STATUS_PROCESS_CRASHED:
|
| -#if defined(OS_ANDROID)
|
| - case base::TERMINATION_STATUS_OOM_PROTECTED:
|
| -#endif
|
| return "crashed";
|
| case base::TERMINATION_STATUS_MAX_ENUM:
|
| break;
|
| @@ -189,7 +186,7 @@ void AttachWebViewHelpers(WebContents* contents) {
|
| WebViewGuest::WebViewGuest(int guest_instance_id,
|
| WebContents* guest_web_contents,
|
| const std::string& embedder_extension_id)
|
| - : GuestView<WebViewGuest>(guest_instance_id),
|
| + : GuestView<WebViewGuest>(guest_instance_id),
|
| script_executor_(new extensions::ScriptExecutor(guest_web_contents,
|
| &script_observers_)),
|
| pending_context_menu_request_id_(0),
|
|
|