Revert of Skip ARC initial screen when everything is set up by policy

chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

 // Copyright 2016 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 <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/proxy/proxy_config_handler.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
@@ skipping 139 matching lines @@
 constexpr char kWifi0ServicePath[] = "stub_wifi0";
 constexpr char kWifi0Ssid[] = "wifi0";
 constexpr char kWifi0Guid[] = "{wifi0_guid}";
 
 constexpr char kWifi1ServicePath[] = "stub_wifi1";
 constexpr char kWifi1Ssid[] = "wifi1";
 constexpr char kWifi1Guid[] = "{wifi1_guid}";
 
 constexpr char kONCPacUrl[] = "http://domain.com/x";
 
-constexpr char kBackupBroadcastAction[] =
-    "org.chromium.arc.intent_helper.SET_BACKUP_ENABLED";
 constexpr char kLocationServiceBroadcastAction[] =
     "org.chromium.arc.intent_helper.SET_LOCATION_SERVICE_ENABLED";
 constexpr char kSetProxyBroadcastAction[] =
     "org.chromium.arc.intent_helper.SET_PROXY";
 
 // Returns the number of |broadcasts| having the |action| action, and checks
 // that all their extras match with |extras|.
 int CountBroadcasts(
     const std::vector<FakeIntentHelperInstance::Broadcast>& broadcasts,
     const std::string& action,
@@ skipping 123 matching lines @@
     service_test->SetServiceProperty(kDefaultServicePath,
                                      shill::kProfileProperty,
                                      base::StringValue(kUserProfilePath));
   }
 
   policy::MockConfigurationPolicyProvider provider_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcSettingsServiceTest);
 };
 
-IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, BackupRestorePolicyTest) {
-  PrefService* const prefs = browser()->profile()->GetPrefs();
-
-  // Set the user pref as initially enabled.
-  prefs->SetBoolean(prefs::kArcBackupRestoreEnabled, true);
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kArcBackupRestoreEnabled));
-
+IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, LocationServicePolicyTest) {
   fake_intent_helper_instance_->clear_broadcasts();
 
   // The policy is set to false.
-  policy::PolicyMap policy;
-  policy.Set(policy::key::kArcBackupRestoreEnabled,
-             policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
-             policy::POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false),
-             nullptr);
-  UpdatePolicy(policy);
-
-  // The pref is disabled and managed, and the corresponding broadcast is sent
-  // at least once.
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kArcBackupRestoreEnabled));
-  EXPECT_TRUE(prefs->IsManagedPreference(prefs::kArcBackupRestoreEnabled));
-  base::DictionaryValue expected_broadcast_extras;
-  expected_broadcast_extras.SetBoolean("enabled", false);
-  expected_broadcast_extras.SetBoolean("managed", true);
-  EXPECT_GE(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
-                            kBackupBroadcastAction, &expected_broadcast_extras),
-            1);
-
-  fake_intent_helper_instance_->clear_broadcasts();
-
-  // The policy is set to true.
-  policy.Set(policy::key::kArcBackupRestoreEnabled,
-             policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
-             policy::POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true),
-             nullptr);
-  UpdatePolicy(policy);
-
-  // The pref is enabled and managed, and the corresponding broadcast is sent at
-  // least once.
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kArcBackupRestoreEnabled));
-  EXPECT_TRUE(prefs->IsManagedPreference(prefs::kArcBackupRestoreEnabled));
-  expected_broadcast_extras.SetBoolean("enabled", true);
-  EXPECT_GE(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
-                            kBackupBroadcastAction, &expected_broadcast_extras),
-            1);
-
-  fake_intent_helper_instance_->clear_broadcasts();
-
-  // The policy is unset.
-  policy.Erase(policy::key::kArcBackupRestoreEnabled);
-  UpdatePolicy(policy);
-
-  // The pref is disabled and unmanaged, and the corresponding broadcast is
-  // sent.
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kArcBackupRestoreEnabled));
-  EXPECT_FALSE(prefs->IsManagedPreference(prefs::kArcBackupRestoreEnabled));
-  expected_broadcast_extras.SetBoolean("enabled", false);
-  expected_broadcast_extras.SetBoolean("managed", false);
-  EXPECT_EQ(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
-                            kBackupBroadcastAction, &expected_broadcast_extras),
-            1);
-}
-
-IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, LocationServicePolicyTest) {
-  PrefService* const prefs = browser()->profile()->GetPrefs();
-
-  // Set the user pref as initially enabled.
-  prefs->SetBoolean(prefs::kArcLocationServiceEnabled, true);
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kArcLocationServiceEnabled));
-
-  fake_intent_helper_instance_->clear_broadcasts();
-
-  // The policy is set to false.
   policy::PolicyMap policy;
   policy.Set(policy::key::kArcLocationServiceEnabled,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
              policy::POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false),
              nullptr);
   UpdatePolicy(policy);
 
-  // The pref is disabled and managed, and the corresponding broadcast is sent
-  // at least once.
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kArcLocationServiceEnabled));
-  EXPECT_TRUE(prefs->IsManagedPreference(prefs::kArcLocationServiceEnabled));
+  // The broadcast is sent which says that the pref is disabled and managed.
   base::DictionaryValue expected_broadcast_extras;
   expected_broadcast_extras.SetBoolean("enabled", false);
   expected_broadcast_extras.SetBoolean("managed", true);
-  EXPECT_GE(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
+  EXPECT_EQ(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
                             kLocationServiceBroadcastAction,
                             &expected_broadcast_extras),
             1);
 
   fake_intent_helper_instance_->clear_broadcasts();
 
   // The policy is set to true.
   policy.Set(policy::key::kArcLocationServiceEnabled,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
              policy::POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true),
              nullptr);
   UpdatePolicy(policy);
 
-  // The pref is enabled and managed, and the corresponding broadcast is sent at
-  // least once.
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kArcLocationServiceEnabled));
-  EXPECT_TRUE(prefs->IsManagedPreference(prefs::kArcLocationServiceEnabled));
+  // The broadcast is sent which says that the pref is enabled and managed.
   expected_broadcast_extras.SetBoolean("enabled", true);
-  EXPECT_GE(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
-                            kLocationServiceBroadcastAction,
-                            &expected_broadcast_extras),
-            1);
-
-  fake_intent_helper_instance_->clear_broadcasts();
-
-  // The policy is unset.
-  policy.Erase(policy::key::kArcLocationServiceEnabled);
-  UpdatePolicy(policy);
-
-  // The pref is disabled and unmanaged, and the corresponding broadcast is
-  // sent.
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kArcLocationServiceEnabled));
-  EXPECT_FALSE(prefs->IsManagedPreference(prefs::kArcLocationServiceEnabled));
-  expected_broadcast_extras.SetBoolean("enabled", false);
-  expected_broadcast_extras.SetBoolean("managed", false);
   EXPECT_EQ(CountBroadcasts(fake_intent_helper_instance_->broadcasts(),
                             kLocationServiceBroadcastAction,
                             &expected_broadcast_extras),
             1);
 }
 
 IN_PROC_BROWSER_TEST_F(ArcSettingsServiceTest, ProxyModePolicyTest) {
   fake_intent_helper_instance_->clear_broadcasts();
 
   policy::PolicyMap policy;
@@ skipping 213 matching lines @@
                                    ProxyPrefs::kFixedServersProxyModeName);
   expected_proxy_config->SetString("host", "proxy-n300");
   expected_proxy_config->SetInteger("port", 3000);
 
   EXPECT_EQ(CountProxyBroadcasts(fake_intent_helper_instance_->broadcasts(),
                                  expected_proxy_config.get()),
             1);
 }
 
 }  // namespace arc