Index: chrome/browser/policy/profile_policy_connector_unittest.cc |
diff --git a/chrome/browser/policy/profile_policy_connector_unittest.cc b/chrome/browser/policy/profile_policy_connector_unittest.cc |
index 7cef1e7fe69d08037502aeb242434c2eb7996119..984369b8b9d0d72f0f757d07fff88dd87165772f 100644 |
--- a/chrome/browser/policy/profile_policy_connector_unittest.cc |
+++ b/chrome/browser/policy/profile_policy_connector_unittest.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/policy/profile_policy_connector.h" |
+#include "chrome/browser/policy/user_policy_connector.h" |
#include "chrome/browser/policy/mock_configuration_policy_provider.h" |
#include "chrome/browser/policy/mock_configuration_policy_store.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -10,7 +10,8 @@ |
using ::testing::_; |
namespace policy { |
- |
+// TODO: throw away |
+/* |
TEST(MergingPolicyProviderTest, MergeProxySettings) { |
MockConfigurationPolicyProvider browser_provider; |
MockConfigurationPolicyProvider profile_provider; |
@@ -53,5 +54,5 @@ TEST(MergingPolicyProviderTest, MergeProxySettings) { |
EXPECT_TRUE(store2.Get(kPolicyProxyServer) != NULL); |
EXPECT_TRUE(store2.Get(kPolicyProxyMode) == NULL); |
} |
- |
+*/ |
} // namespace policy |