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

Side by Side Diff: chrome/browser/chromeos/extensions/default_app_order_unittest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 "chrome/browser/chromeos/extensions/default_app_order.h" 5 #include "chrome/browser/chromeos/extensions/default_app_order.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 13 matching lines...) Expand all
24 const base::FilePath::CharType kTestFile[] = 24 const base::FilePath::CharType kTestFile[] =
25 FILE_PATH_LITERAL("test_default_app_order.json"); 25 FILE_PATH_LITERAL("test_default_app_order.json");
26 } 26 }
27 27
28 class DefaultAppOrderTest : public testing::Test { 28 class DefaultAppOrderTest : public testing::Test {
29 public: 29 public:
30 DefaultAppOrderTest() {} 30 DefaultAppOrderTest() {}
31 virtual ~DefaultAppOrderTest() {} 31 virtual ~DefaultAppOrderTest() {}
32 32
33 // testing::Test overrides: 33 // testing::Test overrides:
34 virtual void SetUp() OVERRIDE { 34 virtual void SetUp() override {
35 default_app_order::Get(&built_in_default_); 35 default_app_order::Get(&built_in_default_);
36 } 36 }
37 virtual void TearDown() OVERRIDE { 37 virtual void TearDown() override {
38 } 38 }
39 39
40 bool IsBuiltInDefault(const std::vector<std::string>& apps) { 40 bool IsBuiltInDefault(const std::vector<std::string>& apps) {
41 if (apps.size() != built_in_default_.size()) 41 if (apps.size() != built_in_default_.size())
42 return false; 42 return false;
43 43
44 for (size_t i = 0; i < built_in_default_.size(); ++i) { 44 for (size_t i = 0; i < built_in_default_.size(); ++i) {
45 if (built_in_default_[i] != apps[i]) 45 if (built_in_default_[i] != apps[i])
46 return false; 46 return false;
47 } 47 }
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 std::vector<std::string> apps; 140 std::vector<std::string> apps;
141 default_app_order::Get(&apps); 141 default_app_order::Get(&apps);
142 EXPECT_EQ(default_app_order::kDefaultAppOrderCount + 2, apps.size()); 142 EXPECT_EQ(default_app_order::kDefaultAppOrderCount + 2, apps.size());
143 EXPECT_EQ(std::string("app1"), apps[0]); 143 EXPECT_EQ(std::string("app1"), apps[0]);
144 EXPECT_EQ(extension_misc::kChromeAppId, apps[1]); 144 EXPECT_EQ(extension_misc::kChromeAppId, apps[1]);
145 EXPECT_EQ(std::string("app2"), 145 EXPECT_EQ(std::string("app2"),
146 apps[default_app_order::kDefaultAppOrderCount + 1]); 146 apps[default_app_order::kDefaultAppOrderCount + 1]);
147 } 147 }
148 148
149 } // namespace chromeos 149 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698