Revert 266094 "Add ScopedStubEnterpriseInstallAttributes for tes..."

trunk/src/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

Index: trunk/src/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc	(revision 266178)
+++ trunk/src/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc	(working copy)
@@ -152,10 +152,6 @@
     : ui_thread_(content::BrowserThread::UI, &message_loop_),
       file_thread_(content::BrowserThread::FILE, &message_loop_),
       io_thread_(content::BrowserThread::IO, &message_loop_),
-      install_attributes_("managed.com",
-                          "user@managed.com",
-                          "device_id",
-                          DEVICE_MODE_ENTERPRISE),
       user_manager_(new chromeos::MockUserManager()),
       user_manager_enabler_(user_manager_) {
     // Run this test with a well-known timezone so that Time::LocalMidnight()
@@ -177,6 +173,13 @@
         cros_settings_->RemoveSettingsProvider(device_settings_provider_));
     cros_settings_->AddSettingsProvider(&stub_settings_provider_);
 
+    // Set up fake install attributes.
+    StubEnterpriseInstallAttributes* attributes =
+        new StubEnterpriseInstallAttributes();
+    attributes->SetDomain("managed.com");
+    attributes->SetRegistrationUser("user@managed.com");
+    BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(attributes);
+
     RestartStatusCollector();
   }
 
@@ -258,7 +261,6 @@
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
 
-  ScopedStubEnterpriseInstallAttributes install_attributes_;
   TestingPrefServiceSimple prefs_;
   chromeos::system::MockStatisticsProvider statistics_provider_;
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;