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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/chromeos/policy/variations_service_policy_browsertest.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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/policy/user_policy_token_loader.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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_policy_builder.h"	5 #include "chrome/browser/chromeos/policy/device_policy_builder.h"

6 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"	6 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

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

8 #include "chrome/browser/metrics/variations/variations_service.h"	7 #include "chrome/browser/metrics/variations/variations_service.h"

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

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

10 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

11	11

12 namespace policy {	12 namespace policy {

13	13

14 class VariationsServiceDevicePolicyTest : public DevicePolicyCrosBrowserTest {	14 class VariationsServiceDevicePolicyTest : public DevicePolicyCrosBrowserTest {

15 protected:	15 protected:

16 VariationsServiceDevicePolicyTest() {}	16 VariationsServiceDevicePolicyTest() {}

17	17

18 void SetUpInProcessBrowserTestFixture() OVERRIDE {	18 void SetUpInProcessBrowserTestFixture() OVERRIDE {

(...skipping 20 matching lines...) Expand all Loading...
39 chrome_variations::VariationsService::	39 chrome_variations::VariationsService::

40 GetDefaultVariationsServerURLForTesting();	40 GetDefaultVariationsServerURLForTesting();

41	41

42 // Device policy has updated the cros settings.	42 // Device policy has updated the cros settings.

43 EXPECT_EQ(default_variations_url + "?restrict=restricted",	43 EXPECT_EQ(default_variations_url + "?restrict=restricted",

44 chrome_variations::VariationsService::GetVariationsServerURL(	44 chrome_variations::VariationsService::GetVariationsServerURL(

45 TestingBrowserProcess::GetGlobal()->local_state()).spec());	45 TestingBrowserProcess::GetGlobal()->local_state()).spec());

46 }	46 }

47	47

48 } // namespace policy	48 } // namespace policy

OLD	NEW