Index: chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
index 507fefe7a03be152308a7bb1f9e4f5b3cf28f603..2f1a3316c1c6d4a1b11a262eb952b9a5f5d0024f 100644 |
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc |
@@ -14,6 +14,7 @@ |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/extensions/test_extension_system.h" |
#include "chrome/browser/infobars/infobar.h" |
+#include "chrome/browser/infobars/infobar_manager.h" |
#include "chrome/browser/infobars/infobar_service.h" |
#include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" |
#include "chrome/browser/translate/translate_infobar_delegate.h" |
@@ -147,11 +148,15 @@ class TranslateManagerRenderViewHostTest |
return InfoBarService::FromWebContents(web_contents()); |
} |
+ InfoBarManager* infobar_manager() { |
+ return infobar_service()->infobar_manager(); |
+ } |
+ |
// Returns the translate infobar if there is 1 infobar and it is a translate |
// infobar. |
TranslateInfoBarDelegate* GetTranslateInfoBar() { |
- return (infobar_service()->infobar_count() == 1) |
- ? infobar_service() |
+ return (infobar_manager()->infobar_count() == 1) |
+ ? infobar_manager() |
->infobar_at(0) |
->delegate() |
->AsTranslateInfoBarDelegate() |
@@ -165,7 +170,7 @@ class TranslateManagerRenderViewHostTest |
if (!infobar) |
return false; |
infobar->InfoBarDismissed(); // Simulates closing the infobar. |
- infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0)); |
+ infobar_manager()->RemoveInfoBar(infobar_manager()->infobar_at(0)); |
return true; |
} |
@@ -189,7 +194,7 @@ class TranslateManagerRenderViewHostTest |
if (!infobar) |
return false; |
infobar->TranslationDeclined(); |
- infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0)); |
+ infobar_manager()->RemoveInfoBar(infobar_manager()->infobar_at(0)); |
return true; |
} |
@@ -733,18 +738,18 @@ TEST_F(TranslateManagerRenderViewHostTest, MultipleOnPageContents) { |
// Simulate clicking 'Nope' (don't translate). |
EXPECT_TRUE(DenyTranslation()); |
- EXPECT_EQ(0U, infobar_service()->infobar_count()); |
+ EXPECT_EQ(0U, infobar_manager()->infobar_count()); |
// Send a new PageContents, we should not show an infobar. |
SimulateOnTranslateLanguageDetermined("fr", true); |
- EXPECT_EQ(0U, infobar_service()->infobar_count()); |
+ EXPECT_EQ(0U, infobar_manager()->infobar_count()); |
// Do the same steps but simulate closing the infobar this time. |
SimulateNavigation(GURL("http://www.youtube.fr"), "fr", true); |
EXPECT_TRUE(CloseTranslateInfoBar()); |
- EXPECT_EQ(0U, infobar_service()->infobar_count()); |
+ EXPECT_EQ(0U, infobar_manager()->infobar_count()); |
SimulateOnTranslateLanguageDetermined("fr", true); |
- EXPECT_EQ(0U, infobar_service()->infobar_count()); |
+ EXPECT_EQ(0U, infobar_manager()->infobar_count()); |
} |
// Test that reloading the page brings back the infobar if the |