summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/browser_window_cocoa.mm
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 19:10:32 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 19:10:32 +0000
commitdc4939992b56ee738e8bb1ae2bb6f127c103b14a (patch)
tree7a8a833c433305918b2da03eb5ee25f76f78d647 /chrome/browser/ui/cocoa/browser_window_cocoa.mm
parentfddd8c81876a00c2c976c1f52cc35b00b3250aee (diff)
downloadchromium_src-dc4939992b56ee738e8bb1ae2bb6f127c103b14a.zip
chromium_src-dc4939992b56ee738e8bb1ae2bb6f127c103b14a.tar.gz
chromium_src-dc4939992b56ee738e8bb1ae2bb6f127c103b14a.tar.bz2
Revert 272217 "LanguageState should be owned by TranslateManager"
This CL is breaking the asan/lsan bots. A snippet of the failure: ==10649==ERROR: AddressSanitizer: heap-use-after-free on address 0x60b0000d0592 at pc 0xbf31f90 bp 0x7fff0930b610 sp 0x7fff0930b608 WRITE of size 1 at 0x60b0000d0592 thread T0 (browser_tests) #0 0xbf31f8f in set_translation_declined components/translate/core/browser/language_state.h:62 #1 0xbf31f8f in TranslateUIDelegate::TranslationDeclined(bool) components/translate/core/browser/translate_ui_delegate.cc:188 #2 0x4614bb4 in TranslateBubbleView::WindowClosing() chrome/browser/ui/views/translate/translate_bubble_view.cc:205 #3 0x4224e9c in views::Widget::OnNativeWidgetDestroying() ui/views/widget/widget.cc:1086 #4 0x4212c95 in OnWindowDestroying ui/views/widget/native_widget_aura.cc:793 #5 0x4212c95 in non-virtual thunk to views::NativeWidgetAura::OnWindowDestroying(aura::Window*) ui/views/widget/native_widget_aura.cc:797 #6 0x60362b7 in aura::Window::~Window() ui/aura/window.cc:225 #7 0x60388ed in aura::Window::~Window() ui/aura/window.cc:218 #8 0x421fb19 in views::Widget::CloseNow() ui/views/widget/widget.cc:614 #9 0x5a03a46 in content::WebContentsImpl::~WebContentsImpl() content/browser/web_contents/web_contents_impl.cc:422 #10 0x5a05ead in content::WebContentsImpl::~WebContentsImpl() content/browser/web_contents/web_contents_impl.cc:373 #11 0x443bda1 in TabStripModel::InternalCloseTab(content::WebContents*, int, bool) chrome/browser/ui/tabs/tab_strip_model.cc:1272 #12 0x4434198 in TabStripModel::InternalCloseTabs(std::vector\u003Cint, std::allocator\u003Cint> > const&, unsigned int) chrome/browser/ui/tabs/tab_strip_model.cc:1247 #13 0x4432c73 in TabStripModel::CloseAllTabs() chrome/browser/ui/tabs/tab_strip_model.cc:545 ... 0x60b0000d0592 is located 82 bytes inside of 104-byte region [0x60b0000d0540,0x60b0000d05a8) freed by thread T0 (browser_tests) here: #0 0x56fcbb in operator delete(void*) /usr/local/google/work/chromium/src/third_party/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:94 #1 0xbf20b7c in TranslateManager::~TranslateManager() components/translate/core/browser/translate_manager.cc:59 #2 0x2926a06 in operator() base/memory/scoped_ptr.h:137 #3 0x2926a06 in reset base/memory/scoped_ptr.h:246 #4 0x2926a06 in reset base/memory/scoped_ptr.h:367 #5 0x2926a06 in WebContentsDestroyed chrome/browser/translate/translate_tab_helper.cc:314 #6 0x2926a06 in non-virtual thunk to TranslateTabHelper::WebContentsDestroyed() chrome/browser/translate/translate_tab_helper.cc:315 #7 0x5a03a46 in content::WebContentsImpl::~WebContentsImpl() content/browser/web_contents/web_contents_impl.cc:422 #8 0x5a05ead in content::WebContentsImpl::~WebContentsImpl() content/browser/web_contents/web_contents_impl.cc:373 #9 0x443bda1 in TabStripModel::InternalCloseTab(content::WebContents*, int, bool) chrome/browser/ui/tabs/tab_strip_model.cc:1272 #10 0x4434198 in TabStripModel::InternalCloseTabs(std::vector\u003Cint, std::allocator\u003Cint> > const&, unsigned int) chrome/browser/ui/tabs/tab_strip_model.cc:1247 #11 0x4432c73 in TabStripModel::CloseAllTabs() chrome/browser/ui/tabs/tab_strip_model.cc:545 ... previously allocated by thread T0 (browser_tests) here: #0 0x56f77b in operator new(unsigned long) /usr/local/google/work/chromium/src/third_party/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:62 #1 0x2923028 in TranslateTabHelper::TranslateTabHelper(content::WebContents*) chrome/browser/translate/translate_tab_helper.cc:78 #2 0x4428959 in CreateForWebContents content/public/browser/web_contents_user_data.h:38 #3 0x4428959 in TabHelpers::AttachTabHelpers(content::WebContents*) chrome/browser/ui/tab_helpers.cc:142 ... > LanguageState should be owned by TranslateManager > > LanguageState is currently owned by ContentTranslateManager, > but it should be moved under TranslateManager > > BUG=345690 > TEST=unittests --gtest_filter=Translate* > TBR=thakis@chromium.org > > Review URL: https://codereview.chromium.org/290573013 TBR=naiem.shaik@gmail.com Review URL: https://codereview.chromium.org/296003014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.mm')
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.mm1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 07b60bf..f9ee6e7 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -50,7 +50,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/autofill/core/common/password_form.h"
-#include "components/translate/core/browser/language_state.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"