| Index: chrome/renderer/translate/translate_helper_browsertest.cc
|
| diff --git a/chrome/renderer/translate/translate_helper_browsertest.cc b/chrome/renderer/translate/translate_helper_browsertest.cc
|
| index f9693392ec3334fcafd24bc02a9b2e2b11d333ec..c9cba3b222bee1efd43c5129917b21c1fbec566c 100644
|
| --- a/chrome/renderer/translate/translate_helper_browsertest.cc
|
| +++ b/chrome/renderer/translate/translate_helper_browsertest.cc
|
| @@ -387,7 +387,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("es", params.a);
|
| + EXPECT_EQ("es", params.a.adopted_language);
|
| render_thread_->sink().ClearMessages();
|
|
|
| // Makes sure we support multiple languages specified.
|
| @@ -398,7 +398,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
|
| ChromeViewHostMsg_TranslateLanguageDetermined::ID);
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("fr", params.a);
|
| + EXPECT_EQ("fr", params.a.adopted_language);
|
| }
|
|
|
| // Tests that the language meta tag works even with non-all-lower-case.
|
| @@ -415,7 +415,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("es", params.a);
|
| + EXPECT_EQ("es", params.a.adopted_language);
|
| render_thread_->sink().ClearMessages();
|
|
|
| // Makes sure we support multiple languages specified.
|
| @@ -426,7 +426,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
|
| ChromeViewHostMsg_TranslateLanguageDetermined::ID);
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("fr", params.a);
|
| + EXPECT_EQ("fr", params.a.adopted_language);
|
| }
|
|
|
| // Tests that the language meta tag is converted to Chrome standard of dashes
|
| @@ -444,7 +444,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("en-US", params.a);
|
| + EXPECT_EQ("en-US", params.a.adopted_language);
|
| render_thread_->sink().ClearMessages();
|
| }
|
|
|
| @@ -458,7 +458,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("zh", params.a);
|
| + EXPECT_EQ("zh", params.a.adopted_language);
|
| render_thread_->sink().ClearMessages();
|
|
|
| LoadHTML("<html><head><meta http-equiv=\"content-language\" content=\"fr\">"
|
| @@ -467,7 +467,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
|
| ChromeViewHostMsg_TranslateLanguageDetermined::ID);
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("fr", params.a);
|
| + EXPECT_EQ("fr", params.a.adopted_language);
|
| render_thread_->sink().ClearMessages();
|
|
|
| GoBack(GetMainFrame()->previousHistoryItem());
|
| @@ -476,6 +476,6 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
|
| ChromeViewHostMsg_TranslateLanguageDetermined::ID);
|
| ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
|
| ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, ¶ms);
|
| - EXPECT_EQ("zh", params.a);
|
| + EXPECT_EQ("zh", params.a.adopted_language);
|
| render_thread_->sink().ClearMessages();
|
| }
|
|
|