chrome/browser/chromeos/settings/cros_settings_unittest.cc - Issue 14008005: Move proto files back into chrome/browser/policy/proto

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/settings/cros_settings_unittest.cc

Issue 14008005: Move proto files back into chrome/browser/policy/proto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 8 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:

Index: chrome/browser/chromeos/settings/cros_settings_unittest.cc

diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc

index c194acf3a022b46d6580c525999445e650f9dbdd..00e162fa7b760fec7134784be1d3879c4f8013d5 100644

--- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc

+++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc

@@ -11,12 +11,12 @@

#include "base/message_loop.h"

#include "base/stl_util.h"

#include "base/values.h"

-#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"

#include "chrome/browser/policy/cloud/cloud_policy_constants.h"

-#include "chrome/browser/policy/cloud/proto/device_management_backend.pb.h"

+#include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"

+#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"

#include "chrome/test/base/scoped_testing_local_state.h"

#include "chrome/test/base/testing_browser_process.h"

#include "content/public/test/test_browser_thread.h"