Commit e27112da authored by Bailey Berro's avatar Bailey Berro Committed by Commit Bot

Disable NativeSmb feature in tests of Add New Services menu

The browser_tests for the Add New Services menu make the assumption that
there are no native FSPs installed, so this change disables NativeSmb in
those tests.

Bug: chromium:757625
Change-Id: I0d4d5d20fd71b3d537b0ef58a109a37ca4fc0cf3
Reviewed-on: https://chromium-review.googlesource.com/1197222
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587877}
parent bc895ea2
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/test/scoped_feature_list.h"
#include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/common/chrome_features.h"
#include "chromeos/chromeos_switches.h" #include "chromeos/chromeos_switches.h"
#include "components/session_manager/core/session_manager.h" #include "components/session_manager/core/session_manager.h"
#include "components/user_manager/user_manager.h" #include "components/user_manager/user_manager.h"
...@@ -122,6 +124,10 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase, ...@@ -122,6 +124,10 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase,
if (GetParam().tablet_mode) { if (GetParam().tablet_mode) {
command_line->AppendSwitchASCII("force-tablet-mode", "touch_view"); command_line->AppendSwitchASCII("force-tablet-mode", "touch_view");
} }
// TODO(crbug.com/879404): Fix tests to work with NativeSMB.
// Tests assume that no native FSPs are enabled.
scoped_feature_list_.InitAndDisableFeature(features::kNativeSmb);
} }
GuestMode GetGuestMode() const override { return GetParam().guest_mode; } GuestMode GetGuestMode() const override { return GetParam().guest_mode; }
...@@ -151,6 +157,7 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase, ...@@ -151,6 +157,7 @@ class FilesAppBrowserTest : public FileManagerBrowserTestBase,
bool GetIsOffline() const override { return GetParam().offline; } bool GetIsOffline() const override { return GetParam().offline; }
private: private:
base::test::ScopedFeatureList scoped_feature_list_;
DISALLOW_COPY_AND_ASSIGN(FilesAppBrowserTest); DISALLOW_COPY_AND_ASSIGN(FilesAppBrowserTest);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment