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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

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, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
index 282dbb94e6cbea91e96085e4bb205549a4168c0c..b45489bb936f79daa80d7f0d103e617b7b209333 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -506,6 +506,11 @@ void FileManagerBrowserTestBase::SetUpInProcessBrowserTestFixture() {
}
}
+void FileManagerBrowserTestBase::SetUp() {
+ net::NetworkChangeNotifier::SetTestNotificationsOnly(true);
+ ExtensionApiTest::SetUp();
+}
+
void FileManagerBrowserTestBase::SetUpOnMainThread() {
ExtensionApiTest::SetUpOnMainThread();
ASSERT_TRUE(local_volume_->Mount(profile()));
@@ -519,8 +524,6 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {
drive_volume_->ConfigureShareUrlBase(share_url_base);
test_util::WaitUntilDriveMountPointIsAdded(profile());
}
-
- net::NetworkChangeNotifier::SetTestNotificationsOnly(true);
}
void FileManagerBrowserTestBase::SetUpCommandLine(

Powered by Google App Engine
This is Rietveld 408576698