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

Side by Side Diff: chrome/browser/policy/cloud_policy_provider_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 unified diff | Download patch | Annotate | Revision Log
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/policy/cloud_policy_provider.h" 5 #include "chrome/browser/policy/cloud_policy_provider.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/policy/browser_policy_connector.h" 9 #include "chrome/browser/policy/browser_policy_connector.h"
10 #include "chrome/browser/policy/cloud_policy_cache_base.h" 10 #include "chrome/browser/policy/cloud_policy_cache_base.h"
11 #include "chrome/browser/policy/cloud_policy_provider.h" 11 #include "chrome/browser/policy/cloud_policy_provider.h"
12 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 12 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
13 #include "chrome/browser/policy/policy_bundle.h" 13 #include "chrome/browser/policy/policy_bundle.h"
14 #include "chrome/browser/policy/policy_map.h" 14 #include "chrome/browser/policy/policy_map.h"
15 #include "content/test/test_browser_thread.h" 15 #include "content/public/test/test_browser_thread.h"
16 #include "policy/policy_constants.h" 16 #include "policy/policy_constants.h"
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 using testing::Mock; 20 using testing::Mock;
21 21
22 namespace em = enterprise_management; 22 namespace em = enterprise_management;
23 23
24 namespace policy { 24 namespace policy {
25 25
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 base::DictionaryValue* proxy_settings = new base::DictionaryValue(); 209 base::DictionaryValue* proxy_settings = new base::DictionaryValue();
210 proxy_settings->SetString(key::kProxyMode, "user mode"); 210 proxy_settings->SetString(key::kProxyMode, "user mode");
211 expected_bundle.Get(POLICY_DOMAIN_CHROME, "") 211 expected_bundle.Get(POLICY_DOMAIN_CHROME, "")
212 .Set(key::kProxySettings, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 212 .Set(key::kProxySettings, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
213 proxy_settings); 213 proxy_settings);
214 EXPECT_TRUE(cloud_policy_provider_.policies().Equals(expected_bundle)); 214 EXPECT_TRUE(cloud_policy_provider_.policies().Equals(expected_bundle));
215 } 215 }
216 #endif 216 #endif
217 217
218 } // namespace policy 218 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/cloud_policy_controller_unittest.cc ('k') | chrome/browser/policy/cloud_policy_subsystem_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698