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

Side by Side Diff: remoting/base/resources_unittest.cc

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
« no previous file with comments | « remoting/base/plugin_thread_task_runner.h ('k') | remoting/base/url_request_context_getter.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 "remoting/base/resources.h" 5 #include "remoting/base/resources.h"
6 6
7 #include "remoting/base/string_resources.h" 7 #include "remoting/base/string_resources.h"
8 #include "ui/base/l10n/l10n_util.h" 8 #include "ui/base/l10n/l10n_util.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 namespace remoting { 11 namespace remoting {
12 12
13 class ResourcesTest : public testing::Test { 13 class ResourcesTest : public testing::Test {
14 protected: 14 protected:
15 ResourcesTest(): resources_available_(false) { 15 ResourcesTest(): resources_available_(false) {
16 } 16 }
17 17
18 virtual void SetUp() OVERRIDE { 18 virtual void SetUp() override {
19 resources_available_ = LoadResources("en-US"); 19 resources_available_ = LoadResources("en-US");
20 } 20 }
21 21
22 virtual void TearDown() OVERRIDE { 22 virtual void TearDown() override {
23 UnloadResources(); 23 UnloadResources();
24 } 24 }
25 25
26 bool resources_available_; 26 bool resources_available_;
27 }; 27 };
28 28
29 // TODO(alexeypa): Reenable the test once http://crbug.com/269143 (ChromeOS) and 29 // TODO(alexeypa): Reenable the test once http://crbug.com/269143 (ChromeOS) and
30 // http://crbug.com/268043 (MacOS) are fixed. 30 // http://crbug.com/268043 (MacOS) are fixed.
31 TEST_F(ResourcesTest, DISABLED_ProductName) { 31 TEST_F(ResourcesTest, DISABLED_ProductName) {
32 #if defined(GOOGLE_CHROME_BUILD) 32 #if defined(GOOGLE_CHROME_BUILD)
33 std::string expected_product_name = "Chrome Remote Desktop"; 33 std::string expected_product_name = "Chrome Remote Desktop";
34 #else // defined(GOOGLE_CHROME_BUILD) 34 #else // defined(GOOGLE_CHROME_BUILD)
35 std::string expected_product_name = "Chromoting"; 35 std::string expected_product_name = "Chromoting";
36 #endif // !defined(GOOGLE_CHROME_BUILD) 36 #endif // !defined(GOOGLE_CHROME_BUILD)
37 37
38 // Chrome-style i18n is not used on Windows. 38 // Chrome-style i18n is not used on Windows.
39 #if defined(OS_WIN) 39 #if defined(OS_WIN)
40 EXPECT_FALSE(resources_available_); 40 EXPECT_FALSE(resources_available_);
41 #else 41 #else
42 EXPECT_TRUE(resources_available_); 42 EXPECT_TRUE(resources_available_);
43 #endif 43 #endif
44 44
45 if (resources_available_) { 45 if (resources_available_) {
46 EXPECT_EQ(expected_product_name, 46 EXPECT_EQ(expected_product_name,
47 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME)); 47 l10n_util::GetStringUTF8(IDS_PRODUCT_NAME));
48 } 48 }
49 } 49 }
50 50
51 } // namespace remoting 51 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/plugin_thread_task_runner.h ('k') | remoting/base/url_request_context_getter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698