reland cl that implement error state for translate infobar

- original review URL: http://codereview.chromium.org/1321003
- this reland fixes uniitest build break in translate_manager_unittest.cc

BUG=38548
TEST=none yet (details in original review url)

Review URL: http://codereview.chromium.org/1542003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42976 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 5 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 548410b..c8c4df0 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -37,6 +37,7 @@
 #include "chrome/common/result_codes.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/thumbnail_score.h"
+#include "chrome/common/translate_errors.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/native_widget_types.h"
 #include "net/base/net_util.h"
@@ -1849,13 +1850,14 @@ void RenderViewHost::OnPageContents(const GURL& url,
 
 void RenderViewHost::OnPageTranslated(int32 page_id,
                                       const std::string& original_lang,
-                                      const std::string& translated_lang) {
+                                      const std::string& translated_lang,
+                                      TranslateErrors::Type error_type) {
   RenderViewHostDelegate::BrowserIntegration* integration_delegate =
       delegate_->GetBrowserIntegrationDelegate();
   if (!integration_delegate)
     return;
-  integration_delegate->OnPageTranslated(page_id,
-                                         original_lang, translated_lang);
+  integration_delegate->OnPageTranslated(page_id, original_lang,
+                                         translated_lang, error_type);
 }
 
 void RenderViewHost::OnContentBlocked(ContentSettingsType type) {
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 96b314c..d628a79 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/page_zoom.h"
+#include "chrome/common/translate_errors.h"
 #include "chrome/common/view_types.h"
 #include "net/base/load_states.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
@@ -618,7 +619,8 @@ class RenderViewHost : public RenderWidgetHost {
                       const std::string& language);
   void OnPageTranslated(int32 page_id,
                         const std::string& original_lang,
-                        const std::string& translated_lang);
+                        const std::string& translated_lang,
+                        TranslateErrors::Type error_type);
 
   void OnContentBlocked(ContentSettingsType type);
 
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 3ac57b9..8c9127b 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/common/content_settings_types.h"
+#include "chrome/common/translate_errors.h"
 #include "chrome/common/view_types.h"
 #include "net/base/load_states.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h"
@@ -234,7 +235,8 @@ class RenderViewHostDelegate {
     // Notification that the page has been translated.
     virtual void OnPageTranslated(int32 page_id,
                                   const std::string& original_lang,
-                                  const std::string& translated_lang) = 0;
+                                  const std::string& translated_lang,
+                                  TranslateErrors::Type error_type) = 0;
   };
 
   // Resource ------------------------------------------------------------------