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

Side by Side Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 // Browser test for basic Chrome OS file manager functionality: 5 // Browser test for basic Chrome OS file manager functionality:
6 // - The file list is updated when a file is added externally to the Downloads 6 // - The file list is updated when a file is added externally to the Downloads
7 // folder. 7 // folder.
8 // - Selecting a file and copy-pasting it with the keyboard copies the file. 8 // - Selecting a file and copy-pasting it with the keyboard copies the file.
9 // - Selecting a file and pressing delete deletes it. 9 // - Selecting a file and pressing delete deletes it.
10 10
(...skipping 1341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 AddAllUsers(); 1352 AddAllUsers();
1353 1353
1354 // Sanity check that normal operations work in multi-profile setting as well. 1354 // Sanity check that normal operations work in multi-profile setting as well.
1355 set_test_case_name("keyboardCopyDrive"); 1355 set_test_case_name("keyboardCopyDrive");
1356 StartTest(); 1356 StartTest();
1357 } 1357 }
1358 1358
1359 template<GuestMode M> 1359 template<GuestMode M>
1360 class GalleryBrowserTestBase : public FileManagerBrowserTestBase { 1360 class GalleryBrowserTestBase : public FileManagerBrowserTestBase {
1361 public: 1361 public:
1362 virtual GuestMode GetGuestModeParam() const override { return M; } 1362 GuestMode GetGuestModeParam() const override { return M; }
1363 virtual const char* GetTestCaseNameParam() const override { 1363 const char* GetTestCaseNameParam() const override {
1364 return test_case_name_.c_str(); 1364 return test_case_name_.c_str();
1365 } 1365 }
1366 1366
1367 protected: 1367 protected:
1368 virtual const char* GetTestManifestName() const override { 1368 const char* GetTestManifestName() const override {
1369 return "gallery_test_manifest.json"; 1369 return "gallery_test_manifest.json";
1370 } 1370 }
1371 1371
1372 void set_test_case_name(const std::string& name) { 1372 void set_test_case_name(const std::string& name) {
1373 test_case_name_ = name; 1373 test_case_name_ = name;
1374 } 1374 }
1375 1375
1376 private: 1376 private:
1377 base::ListValue scripts_; 1377 base::ListValue scripts_;
1378 std::string test_case_name_; 1378 std::string test_case_name_;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1505 } 1505 }
1506 1506
1507 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { 1507 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) {
1508 set_test_case_name("exposureImageOnDrive"); 1508 set_test_case_name("exposureImageOnDrive");
1509 StartTest(); 1509 StartTest();
1510 } 1510 }
1511 1511
1512 template<GuestMode M> 1512 template<GuestMode M>
1513 class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase { 1513 class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase {
1514 public: 1514 public:
1515 virtual GuestMode GetGuestModeParam() const override { return M; } 1515 GuestMode GetGuestModeParam() const override { return M; }
1516 virtual const char* GetTestCaseNameParam() const override { 1516 const char* GetTestCaseNameParam() const override {
1517 return test_case_name_.c_str(); 1517 return test_case_name_.c_str();
1518 } 1518 }
1519 1519
1520 protected: 1520 protected:
1521 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 1521 void SetUpCommandLine(base::CommandLine* command_line) override {
1522 command_line->AppendSwitch( 1522 command_line->AppendSwitch(
1523 chromeos::switches::kEnableVideoPlayerChromecastSupport); 1523 chromeos::switches::kEnableVideoPlayerChromecastSupport);
1524 FileManagerBrowserTestBase::SetUpCommandLine(command_line); 1524 FileManagerBrowserTestBase::SetUpCommandLine(command_line);
1525 } 1525 }
1526 1526
1527 virtual const char* GetTestManifestName() const override { 1527 const char* GetTestManifestName() const override {
1528 return "video_player_test_manifest.json"; 1528 return "video_player_test_manifest.json";
1529 } 1529 }
1530 1530
1531 void set_test_case_name(const std::string& name) { 1531 void set_test_case_name(const std::string& name) {
1532 test_case_name_ = name; 1532 test_case_name_ = name;
1533 } 1533 }
1534 1534
1535 private: 1535 private:
1536 std::string test_case_name_; 1536 std::string test_case_name_;
1537 }; 1537 };
1538 1538
1539 typedef VideoPlayerBrowserTestBase<NOT_IN_GUEST_MODE> VideoPlayerBrowserTest; 1539 typedef VideoPlayerBrowserTestBase<NOT_IN_GUEST_MODE> VideoPlayerBrowserTest;
1540 typedef VideoPlayerBrowserTestBase<IN_GUEST_MODE> 1540 typedef VideoPlayerBrowserTestBase<IN_GUEST_MODE>
1541 VideoPlayerBrowserTestInGuestMode; 1541 VideoPlayerBrowserTestInGuestMode;
1542 1542
1543 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDownloads) { 1543 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDownloads) {
1544 set_test_case_name("openSingleVideoOnDownloads"); 1544 set_test_case_name("openSingleVideoOnDownloads");
1545 StartTest(); 1545 StartTest();
1546 } 1546 }
1547 1547
1548 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) { 1548 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) {
1549 set_test_case_name("openSingleVideoOnDrive"); 1549 set_test_case_name("openSingleVideoOnDrive");
1550 StartTest(); 1550 StartTest();
1551 } 1551 }
1552 1552
1553 } // namespace 1553 } // namespace
1554 } // namespace file_manager 1554 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698