Commit 2d44f1b3 authored by Doug Arnett's avatar Doug Arnett Committed by Commit Bot

Renames translate test class FakePageImpl to FakeTranslateAgent

This is a follow up to rename refactor in cl/2007319 to rename the
corresponding test class for TranslateAgent.

No functional changes.

Bug: 1043351
Change-Id: I06db57f2b07c603f769e6dd4c8d9cda2f163659d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031191Reviewed-by: default avataranthonyvd <anthonyvd@chromium.org>
Commit-Queue: Doug Arnett <dougarnett@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737501}
parent d4b0f8a1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/translate/translate_fake_page.h" #include "chrome/browser/translate/fake_translate_agent.h"
#include <stddef.h> #include <stddef.h>
...@@ -35,20 +35,20 @@ ...@@ -35,20 +35,20 @@
#include "content/public/test/test_renderer_host.h" #include "content/public/test/test_renderer_host.h"
#include "url/gurl.h" #include "url/gurl.h"
FakePageImpl::FakePageImpl() FakeTranslateAgent::FakeTranslateAgent()
: called_translate_(false), called_revert_translation_(false) {} : called_translate_(false), called_revert_translation_(false) {}
FakePageImpl::~FakePageImpl() {} FakeTranslateAgent::~FakeTranslateAgent() {}
mojo::PendingRemote<translate::mojom::TranslateAgent> mojo::PendingRemote<translate::mojom::TranslateAgent>
FakePageImpl::BindToNewPageRemote() { FakeTranslateAgent::BindToNewPageRemote() {
receiver_.reset(); receiver_.reset();
translate_callback_pending_.Reset(); translate_callback_pending_.Reset();
return receiver_.BindNewPipeAndPassRemote(); return receiver_.BindNewPipeAndPassRemote();
} }
// translate::mojom::TranslateAgent implementation. // translate::mojom::TranslateAgent implementation.
void FakePageImpl::TranslateFrame(const std::string& translate_script, void FakeTranslateAgent::TranslateFrame(const std::string& translate_script,
const std::string& source_lang, const std::string& source_lang,
const std::string& target_lang, const std::string& target_lang,
TranslateFrameCallback callback) { TranslateFrameCallback callback) {
...@@ -65,11 +65,12 @@ void FakePageImpl::TranslateFrame(const std::string& translate_script, ...@@ -65,11 +65,12 @@ void FakePageImpl::TranslateFrame(const std::string& translate_script,
translate_callback_pending_ = std::move(callback); translate_callback_pending_ = std::move(callback);
} }
void FakePageImpl::RevertTranslation() { void FakeTranslateAgent::RevertTranslation() {
called_revert_translation_ = true; called_revert_translation_ = true;
} }
void FakePageImpl::PageTranslated(bool cancelled, void FakeTranslateAgent::PageTranslated(
bool cancelled,
const std::string& source_lang, const std::string& source_lang,
const std::string& target_lang, const std::string& target_lang,
translate::TranslateErrors::Type error) { translate::TranslateErrors::Type error) {
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_TRANSLATE_TRANSLATE_FAKE_PAGE_H_ #ifndef CHROME_BROWSER_TRANSLATE_FAKE_TRANSLATE_AGENT_H_
#define CHROME_BROWSER_TRANSLATE_TRANSLATE_FAKE_PAGE_H_ #define CHROME_BROWSER_TRANSLATE_FAKE_TRANSLATE_AGENT_H_
#include <stddef.h> #include <stddef.h>
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
#include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
#include "url/gurl.h" #include "url/gurl.h"
class FakePageImpl : public translate::mojom::TranslateAgent { class FakeTranslateAgent : public translate::mojom::TranslateAgent {
public: public:
FakePageImpl(); FakeTranslateAgent();
~FakePageImpl() override; ~FakeTranslateAgent() override;
mojo::PendingRemote<translate::mojom::TranslateAgent> BindToNewPageRemote(); mojo::PendingRemote<translate::mojom::TranslateAgent> BindToNewPageRemote();
...@@ -68,7 +68,7 @@ class FakePageImpl : public translate::mojom::TranslateAgent { ...@@ -68,7 +68,7 @@ class FakePageImpl : public translate::mojom::TranslateAgent {
private: private:
TranslateFrameCallback translate_callback_pending_; TranslateFrameCallback translate_callback_pending_;
mojo::Receiver<translate::mojom::TranslateAgent> receiver_{this}; mojo::Receiver<translate::mojom::TranslateAgent> receiver_{this};
DISALLOW_COPY_AND_ASSIGN(FakePageImpl); DISALLOW_COPY_AND_ASSIGN(FakeTranslateAgent);
}; };
#endif // CHROME_BROWSER_TRANSLATE_TRANSLATE_FAKE_PAGE_H_ #endif // CHROME_BROWSER_TRANSLATE_FAKE_TRANSLATE_AGENT_H_
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/translate/translate_fake_page.h" #include "chrome/browser/translate/fake_translate_agent.h"
#include "chrome/browser/translate/translate_service.h" #include "chrome/browser/translate/translate_service.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_browser_process.h"
...@@ -55,7 +55,7 @@ class TranslateManagerRenderViewHostAndroidTest ...@@ -55,7 +55,7 @@ class TranslateManagerRenderViewHostAndroidTest
details.adopted_language = lang; details.adopted_language = lang;
ChromeTranslateClient::FromWebContents(web_contents()) ChromeTranslateClient::FromWebContents(web_contents())
->translate_driver() ->translate_driver()
->RegisterPage(fake_page_.BindToNewPageRemote(), details, ->RegisterPage(fake_agent_.BindToNewPageRemote(), details,
page_translatable); page_translatable);
} }
...@@ -117,7 +117,7 @@ class TranslateManagerRenderViewHostAndroidTest ...@@ -117,7 +117,7 @@ class TranslateManagerRenderViewHostAndroidTest
// WARNING: the pointers point to deleted objects, use only for comparison. // WARNING: the pointers point to deleted objects, use only for comparison.
std::set<infobars::InfoBarDelegate*> removed_infobars_; std::set<infobars::InfoBarDelegate*> removed_infobars_;
FakePageImpl fake_page_; FakeTranslateAgent fake_agent_;
DISALLOW_COPY_AND_ASSIGN(TranslateManagerRenderViewHostAndroidTest); DISALLOW_COPY_AND_ASSIGN(TranslateManagerRenderViewHostAndroidTest);
}; };
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
#include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/translate/translate_fake_page.h" #include "chrome/browser/translate/fake_translate_agent.h"
#include "chrome/browser/translate/translate_service.h" #include "chrome/browser/translate/translate_service.h"
#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/translate/translate_bubble_factory.h" #include "chrome/browser/ui/translate/translate_bubble_factory.h"
...@@ -247,19 +247,19 @@ class TranslateManagerRenderViewHostTest ...@@ -247,19 +247,19 @@ class TranslateManagerRenderViewHostTest
details.adopted_language = lang; details.adopted_language = lang;
ChromeTranslateClient::FromWebContents(web_contents()) ChromeTranslateClient::FromWebContents(web_contents())
->translate_driver() ->translate_driver()
->RegisterPage(fake_page_.BindToNewPageRemote(), details, ->RegisterPage(fake_agent_.BindToNewPageRemote(), details,
page_translatable); page_translatable);
} }
void SimulateOnPageTranslated(const std::string& source_lang, void SimulateOnPageTranslated(const std::string& source_lang,
const std::string& target_lang, const std::string& target_lang,
translate::TranslateErrors::Type error) { translate::TranslateErrors::Type error) {
// Ensure fake_page_ Translate() call gets dispatched. // Ensure fake_agent_ Translate() call gets dispatched.
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
fake_page_.PageTranslated(false, source_lang, target_lang, error); fake_agent_.PageTranslated(false, source_lang, target_lang, error);
// Ensure fake_page_ Translate() response callback gets dispatched. // Ensure fake_agent_ Translate() response callback gets dispatched.
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
} }
...@@ -273,27 +273,27 @@ class TranslateManagerRenderViewHostTest ...@@ -273,27 +273,27 @@ class TranslateManagerRenderViewHostTest
std::string* target_lang) { std::string* target_lang) {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
if (!fake_page_.called_translate_) if (!fake_agent_.called_translate_)
return false; return false;
EXPECT_TRUE(fake_page_.source_lang_); EXPECT_TRUE(fake_agent_.source_lang_);
EXPECT_TRUE(fake_page_.target_lang_); EXPECT_TRUE(fake_agent_.target_lang_);
if (original_lang) if (original_lang)
*original_lang = *fake_page_.source_lang_; *original_lang = *fake_agent_.source_lang_;
if (target_lang) if (target_lang)
*target_lang = *fake_page_.target_lang_; *target_lang = *fake_agent_.target_lang_;
// Reset // Reset
fake_page_.called_translate_ = false; fake_agent_.called_translate_ = false;
fake_page_.source_lang_ = base::nullopt; fake_agent_.source_lang_ = base::nullopt;
fake_page_.target_lang_ = base::nullopt; fake_agent_.target_lang_ = base::nullopt;
return true; return true;
} }
bool IsTranslationReverted() { bool IsTranslationReverted() {
base::RunLoop().RunUntilIdle(); base::RunLoop().RunUntilIdle();
return fake_page_.called_revert_translation_; return fake_agent_.called_revert_translation_;
} }
InfoBarService* infobar_service() { InfoBarService* infobar_service() {
...@@ -493,7 +493,7 @@ class TranslateManagerRenderViewHostTest ...@@ -493,7 +493,7 @@ class TranslateManagerRenderViewHostTest
std::set<infobars::InfoBarDelegate*> removed_infobars_; std::set<infobars::InfoBarDelegate*> removed_infobars_;
std::unique_ptr<MockTranslateBubbleFactory> bubble_factory_; std::unique_ptr<MockTranslateBubbleFactory> bubble_factory_;
FakePageImpl fake_page_; FakeTranslateAgent fake_agent_;
ScopedObserver<infobars::InfoBarManager, infobars::InfoBarManager::Observer> ScopedObserver<infobars::InfoBarManager, infobars::InfoBarManager::Observer>
infobar_observer_; infobar_observer_;
......
...@@ -3434,7 +3434,8 @@ test("unit_tests") { ...@@ -3434,7 +3434,8 @@ test("unit_tests") {
"../browser/tracing/background_tracing_metrics_provider_unittest.cc", "../browser/tracing/background_tracing_metrics_provider_unittest.cc",
"../browser/tracing/trace_event_system_stats_monitor_unittest.cc", "../browser/tracing/trace_event_system_stats_monitor_unittest.cc",
"../browser/translate/android/translate_bridge_unittest.cc", "../browser/translate/android/translate_bridge_unittest.cc",
"../browser/translate/translate_fake_page.cc", "../browser/translate/fake_translate_agent.cc",
"../browser/translate/fake_translate_agent.h",
"../browser/translate/translate_service_unittest.cc", "../browser/translate/translate_service_unittest.cc",
"../browser/ui/android/tab_model/tab_model_list_unittest.cc", "../browser/ui/android/tab_model/tab_model_list_unittest.cc",
"../browser/ui/android/toolbar/location_bar_model_android_unittest.cc", "../browser/ui/android/toolbar/location_bar_model_android_unittest.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment