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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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
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 <tuple> 5 #include <tuple>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/common/chrome_isolated_world_ids.h" 10 #include "chrome/common/chrome_isolated_world_ids.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 class TranslateHelperBrowserTest : public ChromeRenderViewTest { 145 class TranslateHelperBrowserTest : public ChromeRenderViewTest {
146 public: 146 public:
147 TranslateHelperBrowserTest() : translate_helper_(NULL) {} 147 TranslateHelperBrowserTest() : translate_helper_(NULL) {}
148 148
149 protected: 149 protected:
150 void SetUp() override { 150 void SetUp() override {
151 ChromeRenderViewTest::SetUp(); 151 ChromeRenderViewTest::SetUp();
152 translate_helper_ = new TestTranslateHelper(view_->GetMainRenderFrame()); 152 translate_helper_ = new TestTranslateHelper(view_->GetMainRenderFrame());
153 153
154 shell::InterfaceProvider* remote_interfaces = 154 service_manager::InterfaceProvider* remote_interfaces =
155 view_->GetMainRenderFrame()->GetRemoteInterfaces(); 155 view_->GetMainRenderFrame()->GetRemoteInterfaces();
156 shell::InterfaceProvider::TestApi test_api(remote_interfaces); 156 service_manager::InterfaceProvider::TestApi test_api(remote_interfaces);
157 test_api.SetBinderForName( 157 test_api.SetBinderForName(
158 translate::mojom::ContentTranslateDriver::Name_, 158 translate::mojom::ContentTranslateDriver::Name_,
159 base::Bind(&FakeContentTranslateDriver::BindHandle, 159 base::Bind(&FakeContentTranslateDriver::BindHandle,
160 base::Unretained(&fake_translate_driver_))); 160 base::Unretained(&fake_translate_driver_)));
161 } 161 }
162 162
163 void TearDown() override { 163 void TearDown() override {
164 delete translate_helper_; 164 delete translate_helper_;
165 ChromeRenderViewTest::TearDown(); 165 ChromeRenderViewTest::TearDown();
166 } 166 }
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 500
501 GoBack(GURL("data:text/html;charset=utf-8,<html><head>" 501 GoBack(GURL("data:text/html;charset=utf-8,<html><head>"
502 "<meta http-equiv=\"content-language\" content=\"zh\">" 502 "<meta http-equiv=\"content-language\" content=\"zh\">"
503 "</head><body>This page is in Chinese.</body></html>"), 503 "</head><body>This page is in Chinese.</body></html>"),
504 back_state); 504 back_state);
505 505
506 base::RunLoop().RunUntilIdle(); 506 base::RunLoop().RunUntilIdle();
507 ASSERT_TRUE(fake_translate_driver_.called_new_page_); 507 ASSERT_TRUE(fake_translate_driver_.called_new_page_);
508 EXPECT_EQ("zh", fake_translate_driver_.details_->adopted_language); 508 EXPECT_EQ("zh", fake_translate_driver_.details_->adopted_language);
509 } 509 }
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_render_frame_observer_browsertest.cc ('k') | chrome/test/base/mash_browser_tests_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698