Revert of Implemented consumer management unenrollment.

chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
index 39737c74be4ac5e2d0015c449cfad018ad683549..5ce5dcfb24b63bae94095f7d8ed23f4b035a46fc 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc
@@ -2,41 +2,61 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_process_platform_part.h"
+#include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "base/message_loop/message_loop.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
-#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "components/policy/core/common/cloud/cloud_policy_client.h"
-#include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
+#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
+namespace {
 
-class DeviceCloudPolicyBrowserTest : public InProcessBrowserTest {
- public:
-  DeviceCloudPolicyBrowserTest() : mock_client_(new MockCloudPolicyClient) {
+// A test fixture simulating a browser that is already managed.
+class DeviceCloudPolicyManagedBrowserTest : public DevicePolicyCrosBrowserTest {
+ protected:
+  DeviceCloudPolicyManagedBrowserTest() {}
+
+  virtual void SetUpInProcessBrowserTestFixture() override {
+    DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
+
+    InstallOwnerKey();
+    MarkAsEnterpriseOwned();
+    RefreshDevicePolicy();
   }
 
-  MockCloudPolicyClient* mock_client_;
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagedBrowserTest);
 };
 
-IN_PROC_BROWSER_TEST_F(DeviceCloudPolicyBrowserTest, Initializer) {
+IN_PROC_BROWSER_TEST_F(DeviceCloudPolicyManagedBrowserTest, NoInitializer) {
   BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  // Initializer exists at first.
-  EXPECT_TRUE(connector->GetDeviceCloudPolicyInitializer());
+  EXPECT_FALSE(connector->GetDeviceCloudPolicyInitializer());
+}
 
-  // Initializer is deleted when the manager connects.
-  connector->GetDeviceCloudPolicyManager()->StartConnection(
-      make_scoped_ptr(mock_client_),
-      connector->GetInstallAttributes());
-  EXPECT_FALSE(connector->GetDeviceCloudPolicyInitializer());
+// A test fixture simulating a browser that is still unmanaged.
+class DeviceCloudPolicyUnmanagedBrowserTest
+    : public DevicePolicyCrosBrowserTest {
+ protected:
+  DeviceCloudPolicyUnmanagedBrowserTest() {}
 
-  // Initializer is restarted when the manager disconnects.
-  connector->GetDeviceCloudPolicyManager()->Disconnect();
+  virtual void SetUpInProcessBrowserTestFixture() override {
+    DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyUnmanagedBrowserTest);
+};
+
+IN_PROC_BROWSER_TEST_F(DeviceCloudPolicyUnmanagedBrowserTest,
+                       StillHasInitializer) {
+  BrowserPolicyConnectorChromeOS* connector =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos();
   EXPECT_TRUE(connector->GetDeviceCloudPolicyInitializer());
 }
 
+}  // namespace
 }  // namespace policy