Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

components/translate/core/browser/translate_infobar_delegate.h

Index: components/translate/core/browser/translate_infobar_delegate.h
diff --git a/chrome/browser/translate/translate_infobar_delegate.h b/components/translate/core/browser/translate_infobar_delegate.h
similarity index 97%
rename from chrome/browser/translate/translate_infobar_delegate.h
rename to components/translate/core/browser/translate_infobar_delegate.h
index 5248e32bf467c364deb56fd6b899212a74c1987e..17ef86a27d58bf9ebfcebb0bfc6e2f05c22f9ec7 100644
--- a/chrome/browser/translate/translate_infobar_delegate.h
+++ b/components/translate/core/browser/translate_infobar_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
+#ifndef COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_
+#define COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_
 
 #include <string>
 #include <utility>
@@ -195,7 +195,7 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
 
   // Gets the TranslateClient associated with this object.
   // May return NULL if the client has been destroyed.
-  TranslateClient* GetTranslateClient();
+  TranslateClient* GetTranslateClient() const;

[Peter Kasting, 2014/05/21 20:38:24]

Can't return a non-const pointer from a const function.  Both should be const,
or neither.

Why is this actually needed, anyway?  For the test?  It's only used once in
translate_infobar_delegate.cc, and there we don't NULL-check, so we might as
well just access translate_manager_->translate_client() directly.

[droger, 2014/05/22 12:33:37]

Done.

 
   // InfoBarDelegate:
   virtual void InfoBarDismissed() OVERRIDE;
@@ -226,4 +226,4 @@ class TranslateInfoBarDelegate : public infobars::InfoBarDelegate {
   DISALLOW_COPY_AND_ASSIGN(TranslateInfoBarDelegate);
 };
 
-#endif  // CHROME_BROWSER_TRANSLATE_TRANSLATE_INFOBAR_DELEGATE_H_
+#endif  // COMPONENTS_TRANSLATE_CORE_BROWSER_TRANSLATE_INFOBAR_DELEGATE_H_