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

Side by Side Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h

Issue 1255263002: Remove a race around NetworkChangeNotifier::test_notifications_only_ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Possible iOS fix Created 5 years, 4 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_
6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ 6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 16 matching lines...) Expand all
27 class LocalTestVolume; 27 class LocalTestVolume;
28 class DriveTestVolume; 28 class DriveTestVolume;
29 class FakeTestVolume; 29 class FakeTestVolume;
30 30
31 // The base test class. 31 // The base test class.
32 class FileManagerBrowserTestBase : public ExtensionApiTest { 32 class FileManagerBrowserTestBase : public ExtensionApiTest {
33 protected: 33 protected:
34 FileManagerBrowserTestBase(); 34 FileManagerBrowserTestBase();
35 ~FileManagerBrowserTestBase() override; 35 ~FileManagerBrowserTestBase() override;
36 36
37 void SetUp() override;
38
37 void SetUpInProcessBrowserTestFixture() override; 39 void SetUpInProcessBrowserTestFixture() override;
38 40
39 void SetUpOnMainThread() override; 41 void SetUpOnMainThread() override;
40 42
41 // Adds an incognito and guest-mode flags for tests in the guest mode. 43 // Adds an incognito and guest-mode flags for tests in the guest mode.
42 void SetUpCommandLine(base::CommandLine* command_line) override; 44 void SetUpCommandLine(base::CommandLine* command_line) override;
43 45
44 // Installs an extension at the specified |path| using the |manifest_name| 46 // Installs an extension at the specified |path| using the |manifest_name|
45 // manifest. 47 // manifest.
46 void InstallExtension(const base::FilePath& path, const char* manifest_name); 48 void InstallExtension(const base::FilePath& path, const char* manifest_name);
(...skipping 21 matching lines...) Expand all
68 Profile* profile); 70 Profile* profile);
69 drive::DriveIntegrationServiceFactory::FactoryCallback 71 drive::DriveIntegrationServiceFactory::FactoryCallback
70 create_drive_integration_service_; 72 create_drive_integration_service_;
71 scoped_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest> 73 scoped_ptr<drive::DriveIntegrationServiceFactory::ScopedFactoryForTest>
72 service_factory_for_test_; 74 service_factory_for_test_;
73 }; 75 };
74 76
75 } // namespace file_manager 77 } // namespace file_manager
76 78
77 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_ 79 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FILE_MANAGER_BROWSERTEST_BASE_H_
OLDNEW
« no previous file with comments | « build/sanitizers/tsan_suppressions.cc ('k') | chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698