Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

Issue 56383002: Disable enterprise user reporting by default in M32. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/device_status_collector.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/device_status_collector.h" 5 #include "chrome/browser/chromeos/policy/device_status_collector.h"
6 6
7 #include "base/command_line.h"
7 #include "base/environment.h" 8 #include "base/environment.h"
8 #include "base/logging.h" 9 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
12 #include "base/prefs/testing_pref_service.h" 13 #include "base/prefs/testing_pref_service.h"
13 #include "base/run_loop.h" 14 #include "base/run_loop.h"
14 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
15 #include "chrome/browser/chromeos/login/mock_user_manager.h" 16 #include "chrome/browser/chromeos/login/mock_user_manager.h"
16 #include "chrome/browser/chromeos/login/user_manager.h" 17 #include "chrome/browser/chromeos/login/user_manager.h"
17 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h" 18 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
18 #include "chrome/browser/chromeos/settings/cros_settings.h" 19 #include "chrome/browser/chromeos/settings/cros_settings.h"
19 #include "chrome/browser/chromeos/settings/device_settings_service.h" 20 #include "chrome/browser/chromeos/settings/device_settings_service.h"
20 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" 21 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
21 #include "chrome/browser/policy/browser_policy_connector.h" 22 #include "chrome/browser/policy/browser_policy_connector.h"
22 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h" 23 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
23 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "chromeos/chromeos_switches.h"
24 #include "chromeos/dbus/dbus_thread_manager.h" 26 #include "chromeos/dbus/dbus_thread_manager.h"
25 #include "chromeos/dbus/shill_device_client.h" 27 #include "chromeos/dbus/shill_device_client.h"
26 #include "chromeos/network/network_handler.h" 28 #include "chromeos/network/network_handler.h"
27 #include "chromeos/settings/cros_settings_names.h" 29 #include "chromeos/settings/cros_settings_names.h"
28 #include "chromeos/settings/cros_settings_provider.h" 30 #include "chromeos/settings/cros_settings_provider.h"
29 #include "chromeos/system/mock_statistics_provider.h" 31 #include "chromeos/system/mock_statistics_provider.h"
30 #include "content/public/browser/browser_thread.h" 32 #include "content/public/browser/browser_thread.h"
31 #include "content/public/browser/geolocation_provider.h" 33 #include "content/public/browser/geolocation_provider.h"
32 #include "content/public/test/test_browser_thread.h" 34 #include "content/public/test/test_browser_thread.h"
33 #include "content/public/test/test_utils.h" 35 #include "content/public/test/test_utils.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 cros_settings_->RemoveSettingsProvider(device_settings_provider_)); 175 cros_settings_->RemoveSettingsProvider(device_settings_provider_));
174 cros_settings_->AddSettingsProvider(&stub_settings_provider_); 176 cros_settings_->AddSettingsProvider(&stub_settings_provider_);
175 177
176 // Set up fake install attributes. 178 // Set up fake install attributes.
177 StubEnterpriseInstallAttributes* attributes = 179 StubEnterpriseInstallAttributes* attributes =
178 new StubEnterpriseInstallAttributes(); 180 new StubEnterpriseInstallAttributes();
179 attributes->SetDomain("managed.com"); 181 attributes->SetDomain("managed.com");
180 attributes->SetRegistrationUser("user@managed.com"); 182 attributes->SetRegistrationUser("user@managed.com");
181 BrowserPolicyConnector::SetInstallAttributesForTesting(attributes); 183 BrowserPolicyConnector::SetInstallAttributesForTesting(attributes);
182 184
185 CommandLine::ForCurrentProcess()->AppendSwitch(
186 chromeos::switches::kEnableEnterpriseUserReporting);
187
183 RestartStatusCollector(); 188 RestartStatusCollector();
184 } 189 }
185 190
186 virtual ~DeviceStatusCollectorTest() { 191 virtual ~DeviceStatusCollectorTest() {
187 // Finish pending tasks. 192 // Finish pending tasks.
188 content::BrowserThread::GetBlockingPool()->FlushForTesting(); 193 content::BrowserThread::GetBlockingPool()->FlushForTesting();
189 message_loop_.RunUntilIdle(); 194 message_loop_.RunUntilIdle();
190 195
191 // Restore the real DeviceSettingsProvider. 196 // Restore the real DeviceSettingsProvider.
192 EXPECT_TRUE( 197 EXPECT_TRUE(
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 } 768 }
764 769
765 EXPECT_TRUE(found_match) << "No matching interface for fake device " << i; 770 EXPECT_TRUE(found_match) << "No matching interface for fake device " << i;
766 count++; 771 count++;
767 } 772 }
768 773
769 EXPECT_EQ(count, status_.network_interface_size()); 774 EXPECT_EQ(count, status_.network_interface_size());
770 } 775 }
771 776
772 } // namespace policy 777 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/device_status_collector.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698