1 files changed, 11 insertions, 10 deletions

diff --git a/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h
index c3fc3b3344e..30e838249f8 100644
--- a/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -44,7 +44,7 @@ class ImeObserver : public input_method::InputMethodEngineBase::Observer {
  public:
   ImeObserver(const std::string& extension_id, Profile* profile);
 
-  ~ImeObserver() override {}
+  ~ImeObserver() override = default;
 
   // input_method::InputMethodEngineBase::Observer overrides.
   void OnActivate(const std::string& component_id) override;
@@ -58,7 +58,6 @@ class ImeObserver : public input_method::InputMethodEngineBase::Observer {
   void OnDeactivated(const std::string& component_id) override;
   void OnCompositionBoundsChanged(
       const std::vector<gfx::Rect>& bounds) override;
-  bool IsInterestedInKeyEvent() const override;
   void OnSurroundingTextChanged(const std::string& component_id,
                                 const std::string& text,
                                 int cursor_pos,
@@ -94,15 +93,17 @@ class ImeObserver : public input_method::InputMethodEngineBase::Observer {
       IMEEngineHandlerInterface::InputContext input_context);
   virtual bool ConvertInputContextAutoComplete(
       IMEEngineHandlerInterface::InputContext input_context);
-  virtual extensions::api::input_ime::AutoCapitalizeType
-  ConvertInputContextAutoCapitalize(
-      IMEEngineHandlerInterface::InputContext input_context);
   virtual bool ConvertInputContextSpellCheck(
       IMEEngineHandlerInterface::InputContext input_context);
 
   std::string extension_id_;
   Profile* profile_;
 
+ private:
+  extensions::api::input_ime::AutoCapitalizeType
+  ConvertInputContextAutoCapitalize(
+      IMEEngineHandlerInterface::InputContext input_context);
+
   DISALLOW_COPY_AND_ASSIGN(ImeObserver);
 };
 
@@ -134,7 +135,7 @@ class InputImeKeyEventHandledFunction : public ExtensionFunction {
                              INPUT_IME_KEYEVENTHANDLED)
 
  protected:
-  ~InputImeKeyEventHandledFunction() override {}
+  ~InputImeKeyEventHandledFunction() override = default;
 
   // ExtensionFunction:
   ResponseAction Run() override;
@@ -146,7 +147,7 @@ class InputImeSetCompositionFunction : public ExtensionFunction {
                              INPUT_IME_SETCOMPOSITION)
 
  protected:
-  ~InputImeSetCompositionFunction() override {}
+  ~InputImeSetCompositionFunction() override = default;
 
   // ExtensionFunction:
   ResponseAction Run() override;
@@ -157,7 +158,7 @@ class InputImeCommitTextFunction : public ExtensionFunction {
   DECLARE_EXTENSION_FUNCTION("input.ime.commitText", INPUT_IME_COMMITTEXT)
 
  protected:
-  ~InputImeCommitTextFunction() override {}
+  ~InputImeCommitTextFunction() override = default;
 
   // ExtensionFunction:
   ResponseAction Run() override;
@@ -168,7 +169,7 @@ class InputImeSendKeyEventsFunction : public ExtensionFunction {
   DECLARE_EXTENSION_FUNCTION("input.ime.sendKeyEvents", INPUT_IME_SENDKEYEVENTS)
 
  protected:
-  ~InputImeSendKeyEventsFunction() override {}
+  ~InputImeSendKeyEventsFunction() override = default;
 
   // ExtensionFunction:
   ResponseAction Run() override;
@@ -216,7 +217,7 @@ class InputImeAPI : public BrowserContextKeyedAPI,
 
   // Listen to extension load, unloaded notifications.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
-      extension_registry_observer_;
+      extension_registry_observer_{this};
 
   content::NotificationRegistrar registrar_;