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

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

Issue 630603003: Replacing the OVERRIDE with override in chrome/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 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 "base/time/time.h" 5 #include "base/time/time.h"
6 #include "chrome/renderer/isolated_world_ids.h" 6 #include "chrome/renderer/isolated_world_ids.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/content/renderer/translate_helper.h" 9 #include "components/translate/content/renderer/translate_helper.h"
10 #include "components/translate/core/common/translate_constants.h" 10 #include "components/translate/core/common/translate_constants.h"
(...skipping 10 matching lines...) Expand all
21 21
22 class TestTranslateHelper : public translate::TranslateHelper { 22 class TestTranslateHelper : public translate::TranslateHelper {
23 public: 23 public:
24 explicit TestTranslateHelper(content::RenderView* render_view) 24 explicit TestTranslateHelper(content::RenderView* render_view)
25 : translate::TranslateHelper( 25 : translate::TranslateHelper(
26 render_view, 26 render_view,
27 chrome::ISOLATED_WORLD_ID_TRANSLATE, 27 chrome::ISOLATED_WORLD_ID_TRANSLATE,
28 extensions::EXTENSION_GROUP_INTERNAL_TRANSLATE_SCRIPTS, 28 extensions::EXTENSION_GROUP_INTERNAL_TRANSLATE_SCRIPTS,
29 extensions::kExtensionScheme) {} 29 extensions::kExtensionScheme) {}
30 30
31 virtual base::TimeDelta AdjustDelay(int delayInMs) OVERRIDE { 31 virtual base::TimeDelta AdjustDelay(int delayInMs) override {
32 // Just returns base::TimeDelta() which has initial value 0. 32 // Just returns base::TimeDelta() which has initial value 0.
33 // Tasks doesn't need to be delayed in tests. 33 // Tasks doesn't need to be delayed in tests.
34 return base::TimeDelta(); 34 return base::TimeDelta();
35 } 35 }
36 36
37 void TranslatePage(const std::string& source_lang, 37 void TranslatePage(const std::string& source_lang,
38 const std::string& target_lang, 38 const std::string& target_lang,
39 const std::string& translate_script) { 39 const std::string& translate_script) {
40 OnTranslatePage(0, translate_script, source_lang, target_lang); 40 OnTranslatePage(0, translate_script, source_lang, target_lang);
41 } 41 }
(...skipping 12 matching lines...) Expand all
54 54
55 private: 55 private:
56 DISALLOW_COPY_AND_ASSIGN(TestTranslateHelper); 56 DISALLOW_COPY_AND_ASSIGN(TestTranslateHelper);
57 }; 57 };
58 58
59 class TranslateHelperBrowserTest : public ChromeRenderViewTest { 59 class TranslateHelperBrowserTest : public ChromeRenderViewTest {
60 public: 60 public:
61 TranslateHelperBrowserTest() : translate_helper_(NULL) {} 61 TranslateHelperBrowserTest() : translate_helper_(NULL) {}
62 62
63 protected: 63 protected:
64 virtual void SetUp() OVERRIDE { 64 virtual void SetUp() override {
65 ChromeRenderViewTest::SetUp(); 65 ChromeRenderViewTest::SetUp();
66 translate_helper_ = new TestTranslateHelper(view_); 66 translate_helper_ = new TestTranslateHelper(view_);
67 } 67 }
68 68
69 virtual void TearDown() OVERRIDE { 69 virtual void TearDown() override {
70 delete translate_helper_; 70 delete translate_helper_;
71 ChromeRenderViewTest::TearDown(); 71 ChromeRenderViewTest::TearDown();
72 } 72 }
73 73
74 bool GetPageTranslatedMessage(std::string* original_lang, 74 bool GetPageTranslatedMessage(std::string* original_lang,
75 std::string* target_lang, 75 std::string* target_lang,
76 translate::TranslateErrors::Type* error) { 76 translate::TranslateErrors::Type* error) {
77 const IPC::Message* message = render_thread_->sink(). 77 const IPC::Message* message = render_thread_->sink().
78 GetUniqueMessageMatching(ChromeViewHostMsg_PageTranslated::ID); 78 GetUniqueMessageMatching(ChromeViewHostMsg_PageTranslated::ID);
79 if (!message) 79 if (!message)
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 454
455 GoBack(back_state); 455 GoBack(back_state);
456 456
457 message = render_thread_->sink().GetUniqueMessageMatching( 457 message = render_thread_->sink().GetUniqueMessageMatching(
458 ChromeViewHostMsg_TranslateLanguageDetermined::ID); 458 ChromeViewHostMsg_TranslateLanguageDetermined::ID);
459 ASSERT_NE(static_cast<IPC::Message*>(NULL), message); 459 ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
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 }
OLDNEW
« no previous file with comments | « chrome/renderer/spellchecker/spellcheck_unittest.cc ('k') | chrome/renderer/translate/translate_script_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698