Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: chrome/renderer/translate/translate_helper_browsertest.cc

Issue 266013002: Remove HistoryController::GetPreviousEntry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase; remove browser half of quirk. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/public/test/render_view_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/time/time.h" 5 #include "base/time/time.h"
6 #include "chrome/renderer/translate/translate_helper.h" 6 #include "chrome/renderer/translate/translate_helper.h"
7 #include "chrome/test/base/chrome_render_view_test.h" 7 #include "chrome/test/base/chrome_render_view_test.h"
8 #include "components/translate/content/common/translate_messages.h" 8 #include "components/translate/content/common/translate_messages.h"
9 #include "components/translate/core/common/translate_constants.h" 9 #include "components/translate/core/common/translate_constants.h"
10 #include "content/public/renderer/render_view.h" 10 #include "content/public/renderer/render_view.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 LoadHTML("<html><head><meta http-equiv=\"content-language\" content=\"zh\">" 454 LoadHTML("<html><head><meta http-equiv=\"content-language\" content=\"zh\">"
455 "</head><body>This page is in Chinese.</body></html>"); 455 "</head><body>This page is in Chinese.</body></html>");
456 const IPC::Message* message = render_thread_->sink().GetUniqueMessageMatching( 456 const IPC::Message* message = render_thread_->sink().GetUniqueMessageMatching(
457 ChromeViewHostMsg_TranslateLanguageDetermined::ID); 457 ChromeViewHostMsg_TranslateLanguageDetermined::ID);
458 ASSERT_NE(static_cast<IPC::Message*>(NULL), message); 458 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
459 ChromeViewHostMsg_TranslateLanguageDetermined::Param params; 459 ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
460 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params); 460 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
461 EXPECT_EQ("zh", params.a.adopted_language); 461 EXPECT_EQ("zh", params.a.adopted_language);
462 render_thread_->sink().ClearMessages(); 462 render_thread_->sink().ClearMessages();
463 463
464 content::PageState back_state = GetCurrentPageState();
465
464 LoadHTML("<html><head><meta http-equiv=\"content-language\" content=\"fr\">" 466 LoadHTML("<html><head><meta http-equiv=\"content-language\" content=\"fr\">"
465 "</head><body>This page is in French.</body></html>"); 467 "</head><body>This page is in French.</body></html>");
466 message = render_thread_->sink().GetUniqueMessageMatching( 468 message = render_thread_->sink().GetUniqueMessageMatching(
467 ChromeViewHostMsg_TranslateLanguageDetermined::ID); 469 ChromeViewHostMsg_TranslateLanguageDetermined::ID);
468 ASSERT_NE(static_cast<IPC::Message*>(NULL), message); 470 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
469 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params); 471 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
470 EXPECT_EQ("fr", params.a.adopted_language); 472 EXPECT_EQ("fr", params.a.adopted_language);
471 render_thread_->sink().ClearMessages(); 473 render_thread_->sink().ClearMessages();
472 474
473 GoBackToPrevious(); 475 GoBack(back_state);
474 476
475 message = render_thread_->sink().GetUniqueMessageMatching( 477 message = render_thread_->sink().GetUniqueMessageMatching(
476 ChromeViewHostMsg_TranslateLanguageDetermined::ID); 478 ChromeViewHostMsg_TranslateLanguageDetermined::ID);
477 ASSERT_NE(static_cast<IPC::Message*>(NULL), message); 479 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
478 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params); 480 ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
479 EXPECT_EQ("zh", params.a.adopted_language); 481 EXPECT_EQ("zh", params.a.adopted_language);
480 render_thread_->sink().ClearMessages(); 482 render_thread_->sink().ClearMessages();
481 } 483 }
OLDNEW
« no previous file with comments | « no previous file | content/public/test/render_view_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698