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

Unified Diff: trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc

Issue 17068004: Revert 207755 "Add device policies to control accessibility sett..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc (revision 207797)
+++ trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
-#include <string>
#include <vector>
#include "base/file_util.h"
@@ -13,8 +12,6 @@
#include "base/path_service.h"
#include "base/stl_util.h"
#include "chrome/browser/chromeos/policy/device_policy_builder.h"
-#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
-#include "chrome/browser/policy/proto/chromeos/install_attributes.pb.h"
#include "chromeos/chromeos_paths.h"
#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
#include "crypto/rsa_private_key.h"
@@ -27,32 +24,6 @@
namespace policy {
-// static
-void DevicePolicyCrosBrowserTest::MarkAsEnterpriseOwned(
- base::ScopedTempDir* temp_dir) {
- cryptohome::SerializedInstallAttributes install_attrs_proto;
- cryptohome::SerializedInstallAttributes::Attribute* attribute = NULL;
-
- attribute = install_attrs_proto.add_attributes();
- attribute->set_name(EnterpriseInstallAttributes::kAttrEnterpriseOwned);
- attribute->set_value("true");
-
- attribute = install_attrs_proto.add_attributes();
- attribute->set_name(EnterpriseInstallAttributes::kAttrEnterpriseUser);
- attribute->set_value(DevicePolicyBuilder::kFakeUsername);
-
- base::FilePath install_attrs_file =
- temp_dir->path().AppendASCII("install_attributes.pb");
- const std::string install_attrs_blob(
- install_attrs_proto.SerializeAsString());
- ASSERT_EQ(static_cast<int>(install_attrs_blob.size()),
- file_util::WriteFile(install_attrs_file,
- install_attrs_blob.c_str(),
- install_attrs_blob.size()));
- ASSERT_TRUE(PathService::Override(chromeos::FILE_INSTALL_ATTRIBUTES,
- install_attrs_file));
-}
-
DevicePolicyCrosBrowserTest::DevicePolicyCrosBrowserTest()
: mock_dbus_thread_manager_(
new chromeos::MockDBusThreadManagerWithoutGMock) {

Powered by Google App Engine
This is Rietveld 408576698