| Index: chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
|
| diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
|
| index 84cacefef40cd4dbe53036ac459f633d5711c096..4055cf71723975109c71637453b73823b4a718cf 100644
|
| --- a/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
|
| +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer_browsertest.cc
|
| @@ -46,21 +46,19 @@ class MockRenderViewContextMenu : public RenderViewContextMenuProxy {
|
| virtual ~MockRenderViewContextMenu();
|
|
|
| // RenderViewContextMenuProxy implementation.
|
| - virtual void AddMenuItem(int command_id,
|
| - const base::string16& title) override;
|
| - virtual void AddCheckItem(int command_id,
|
| - const base::string16& title) override;
|
| - virtual void AddSeparator() override;
|
| - virtual void AddSubMenu(int command_id,
|
| - const base::string16& label,
|
| - ui::MenuModel* model) override;
|
| - virtual void UpdateMenuItem(int command_id,
|
| - bool enabled,
|
| - bool hidden,
|
| - const base::string16& title) override;
|
| - virtual RenderViewHost* GetRenderViewHost() const override;
|
| - virtual WebContents* GetWebContents() const override;
|
| - virtual content::BrowserContext* GetBrowserContext() const override;
|
| + void AddMenuItem(int command_id, const base::string16& title) override;
|
| + void AddCheckItem(int command_id, const base::string16& title) override;
|
| + void AddSeparator() override;
|
| + void AddSubMenu(int command_id,
|
| + const base::string16& label,
|
| + ui::MenuModel* model) override;
|
| + void UpdateMenuItem(int command_id,
|
| + bool enabled,
|
| + bool hidden,
|
| + const base::string16& title) override;
|
| + RenderViewHost* GetRenderViewHost() const override;
|
| + WebContents* GetWebContents() const override;
|
| + content::BrowserContext* GetBrowserContext() const override;
|
|
|
| // Attaches a RenderViewContextMenuObserver to be tested.
|
| void SetObserver(RenderViewContextMenuObserver* observer);
|
| @@ -206,11 +204,9 @@ class SpellingMenuObserverTest : public InProcessBrowserTest {
|
| public:
|
| SpellingMenuObserverTest();
|
|
|
| - virtual void SetUpOnMainThread() override {
|
| - Reset(false);
|
| - }
|
| + void SetUpOnMainThread() override { Reset(false); }
|
|
|
| - virtual void TearDownOnMainThread() override {
|
| + void TearDownOnMainThread() override {
|
| observer_.reset();
|
| menu_.reset();
|
| }
|
|
|