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

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: 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 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 AddAllUsers(); 1351 AddAllUsers();
1352 1352
1353 // Sanity check that normal operations work in multi-profile setting as well. 1353 // Sanity check that normal operations work in multi-profile setting as well.
1354 set_test_case_name("keyboardCopyDrive"); 1354 set_test_case_name("keyboardCopyDrive");
1355 StartTest(); 1355 StartTest();
1356 } 1356 }
1357 1357
1358 template<GuestMode M> 1358 template<GuestMode M>
1359 class GalleryBrowserTestBase : public FileManagerBrowserTestBase { 1359 class GalleryBrowserTestBase : public FileManagerBrowserTestBase {
1360 public: 1360 public:
1361 virtual GuestMode GetGuestModeParam() const override { return M; } 1361 GuestMode GetGuestModeParam() const override { return M; }
1362 virtual const char* GetTestCaseNameParam() const override { 1362 const char* GetTestCaseNameParam() const override {
1363 return test_case_name_.c_str(); 1363 return test_case_name_.c_str();
1364 } 1364 }
1365 1365
1366 protected: 1366 protected:
1367 virtual const char* GetTestManifestName() const override { 1367 const char* GetTestManifestName() const override {
1368 return "gallery_test_manifest.json"; 1368 return "gallery_test_manifest.json";
1369 } 1369 }
1370 1370
1371 void set_test_case_name(const std::string& name) { 1371 void set_test_case_name(const std::string& name) {
1372 test_case_name_ = name; 1372 test_case_name_ = name;
1373 } 1373 }
1374 1374
1375 private: 1375 private:
1376 base::ListValue scripts_; 1376 base::ListValue scripts_;
1377 std::string test_case_name_; 1377 std::string test_case_name_;
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1504 } 1504 }
1505 1505
1506 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) { 1506 IN_PROC_BROWSER_TEST_F(GalleryBrowserTest, ExposureImageOnDrive) {
1507 set_test_case_name("exposureImageOnDrive"); 1507 set_test_case_name("exposureImageOnDrive");
1508 StartTest(); 1508 StartTest();
1509 } 1509 }
1510 1510
1511 template<GuestMode M> 1511 template<GuestMode M>
1512 class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase { 1512 class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase {
1513 public: 1513 public:
1514 virtual GuestMode GetGuestModeParam() const override { return M; } 1514 GuestMode GetGuestModeParam() const override { return M; }
1515 virtual const char* GetTestCaseNameParam() const override { 1515 const char* GetTestCaseNameParam() const override {
1516 return test_case_name_.c_str(); 1516 return test_case_name_.c_str();
1517 } 1517 }
1518 1518
1519 protected: 1519 protected:
1520 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 1520 void SetUpCommandLine(base::CommandLine* command_line) override {
1521 command_line->AppendSwitch( 1521 command_line->AppendSwitch(
1522 chromeos::switches::kEnableVideoPlayerChromecastSupport); 1522 chromeos::switches::kEnableVideoPlayerChromecastSupport);
1523 FileManagerBrowserTestBase::SetUpCommandLine(command_line); 1523 FileManagerBrowserTestBase::SetUpCommandLine(command_line);
1524 } 1524 }
1525 1525
1526 virtual const char* GetTestManifestName() const override { 1526 const char* GetTestManifestName() const override {
1527 return "video_player_test_manifest.json"; 1527 return "video_player_test_manifest.json";
1528 } 1528 }
1529 1529
1530 void set_test_case_name(const std::string& name) { 1530 void set_test_case_name(const std::string& name) {
1531 test_case_name_ = name; 1531 test_case_name_ = name;
1532 } 1532 }
1533 1533
1534 private: 1534 private:
1535 std::string test_case_name_; 1535 std::string test_case_name_;
1536 }; 1536 };
1537 1537
1538 typedef VideoPlayerBrowserTestBase<NOT_IN_GUEST_MODE> VideoPlayerBrowserTest; 1538 typedef VideoPlayerBrowserTestBase<NOT_IN_GUEST_MODE> VideoPlayerBrowserTest;
1539 typedef VideoPlayerBrowserTestBase<IN_GUEST_MODE> 1539 typedef VideoPlayerBrowserTestBase<IN_GUEST_MODE>
1540 VideoPlayerBrowserTestInGuestMode; 1540 VideoPlayerBrowserTestInGuestMode;
1541 1541
1542 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDownloads) { 1542 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDownloads) {
1543 set_test_case_name("openSingleVideoOnDownloads"); 1543 set_test_case_name("openSingleVideoOnDownloads");
1544 StartTest(); 1544 StartTest();
1545 } 1545 }
1546 1546
1547 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) { 1547 IN_PROC_BROWSER_TEST_F(VideoPlayerBrowserTest, OpenSingleVideoOnDrive) {
1548 set_test_case_name("openSingleVideoOnDrive"); 1548 set_test_case_name("openSingleVideoOnDrive");
1549 StartTest(); 1549 StartTest();
1550 } 1550 }
1551 1551
1552 } // namespace 1552 } // namespace
1553 } // namespace file_manager 1553 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698