Make login screen apps enabled by default

chrome/browser/chromeos/policy/signin_profile_apps_policy_browsertest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
@@ skipping 127 matching lines @@
   // Intentionally not using the |chromeos::ProfileHelper::GetSigninProfile|
   // method here, as it performs the lazy construction of the profile, while for
   // the testing purposes it's better to assert that it has been created before.
   Profile* const profile =
       g_browser_process->profile_manager()->GetProfileByPath(
           chromeos::ProfileHelper::GetSigninProfileDir());
   DCHECK(profile);
   return profile;
 }
 
-// Tests for the sign-in profile apps being enabled via the command line flag.
-// TODO(emaxx): Remove this smoke test once it's investigated whether just
-// specifying this command line flag leads to tests being timed out.
-class SigninProfileAppsEnabledViaCommandLineTest : public InProcessBrowserTest {
- protected:
-  SigninProfileAppsEnabledViaCommandLineTest() {}
-
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableLoginScreenApps);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(SigninProfileAppsEnabledViaCommandLineTest);
-};
-
 }  // namespace
 
-IN_PROC_BROWSER_TEST_F(SigninProfileAppsEnabledViaCommandLineTest,
-                       NoExtensions) {
-  EXPECT_TRUE(extensions::ExtensionSystem::Get(GetProfile())
-                  ->extension_service()
-                  ->extensions_enabled());
-}
-
 namespace {
 
 // Base class for testing sign-in profile apps that are installed via the device
 // policy.
 class SigninProfileAppsPolicyTestBase : public DevicePolicyCrosBrowserTest {
  protected:
   explicit SigninProfileAppsPolicyTestBase(version_info::Channel channel)
       : channel_(channel), scoped_current_channel_(channel) {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     DevicePolicyCrosBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
     command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
-    command_line->AppendSwitch(switches::kEnableLoginScreenApps);
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
     InstallOwnerKey();
     MarkAsEnterpriseOwned();
   }
 
   void SetUpOnMainThread() override {
     EnableUrlRequestMocks();
@@ skipping 121 matching lines @@
  protected:
   SigninProfileAppsPolicyTest()
       : SigninProfileAppsPolicyTestBase(version_info::Channel::UNKNOWN) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SigninProfileAppsPolicyTest);
 };
 
 }  // namespace
 
+// Tests that the extension system enables non-standard extensions in the
+// sign-in profile.
+IN_PROC_BROWSER_TEST_F(SigninProfileAppsPolicyTest, ExtensionsEnabled) {
+  EXPECT_TRUE(extensions::ExtensionSystem::Get(GetProfile())
+                  ->extension_service()
+                  ->extensions_enabled());
+}
+
 // Tests that a background page is created for the installed sign-in profile
 // app.
 IN_PROC_BROWSER_TEST_F(SigninProfileAppsPolicyTest, BackgroundPage) {
   ExtensionBackgroundPageReadyObserver page_observer(kTrivialAppId);
   AddExtensionForForceInstallation(
       kTrivialAppId, base::FilePath(kTrivialAppUpdateManifestPath));
   page_observer.Wait();
 }
 
 // Tests installation of multiple sign-in profile apps.
 IN_PROC_BROWSER_TEST_F(SigninProfileAppsPolicyTest, MultipleApps) {
   extensions::TestExtensionRegistryObserver registry_observer1(
       extensions::ExtensionRegistry::Get(GetProfile()), kTestAppId);
   extensions::TestExtensionRegistryObserver registry_observer2(
       extensions::ExtensionRegistry::Get(GetProfile()), kTrivialAppId);
 
   AddExtensionForForceInstallation(kTestAppId,
                                    base::FilePath(kTestAppUpdateManifestPath));
   AddExtensionForForceInstallation(
       kTrivialAppId, base::FilePath(kTrivialAppUpdateManifestPath));
 
   registry_observer1.WaitForExtensionLoaded();
   registry_observer2.WaitForExtensionLoaded();
 }
 
 }  // namespace policy