Fixes and improvements to cloud policy for extensions.

chrome/browser/policy/cloud/component_cloud_policy_service_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/cloud/component_cloud_policy_service.h"
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/sha1.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/mock_cloud_policy_client.h"
 #include "chrome/browser/policy/cloud/mock_cloud_policy_store.h"
 #include "chrome/browser/policy/cloud/policy_builder.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chrome/browser/policy/external_data_fetcher.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_types.h"
 #include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"
 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/browser/policy/schema_map.h"
+#include "chrome/browser/policy/test/policy_test_utils.h"
 #include "components/policy/core/common/schema.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace em = enterprise_management;
 
@@ skipping 11 matching lines @@
     "{"
     "  \"Name\": {"
     "    \"Value\": \"disabled\""
     "  },"
     "  \"Second\": {"
     "    \"Value\": \"maybe\","
     "    \"Level\": \"Recommended\""
     "  }"
     "}";
 
+const char kInvalidTestPolicy[] =
+    "{"
+    "  \"Name\": {"
+    "    \"Value\": \"published\""
+    "  },"
+    "  \"Undeclared Name\": {"
+    "    \"Value\": \"not published\""
+    "  }"
+    "}";
+
 const char kTestSchema[] =
     "{"
     "  \"type\": \"object\","
     "  \"properties\": {"
     "    \"Name\": { \"type\": \"string\" },"
     "    \"Second\": { \"type\": \"string\" }"
     "  }"
     "}";
 
 class MockComponentCloudPolicyDelegate
@@ skipping 439 matching lines @@
   store_.policy_.reset();
   store_.NotifyStoreLoaded();
   RunUntilIdle();
   Mock::VerifyAndClearExpectations(&delegate_);
   const PolicyBundle empty_bundle;
   EXPECT_TRUE(service_->policy().Equals(empty_bundle));
   cache_->LoadAllSubkeys("extension-policy", &contents);
   ASSERT_EQ(0u, contents.size());
 }
 
+TEST_F(ComponentCloudPolicyServiceTest, LoadInvalidPolicyFromCache) {
+  // Put the invalid test policy in the cache. One of its policies will be
+  // loaded, the other should be filtered out by the schema.
+  builder_.payload().set_secure_hash(base::SHA1HashString(kInvalidTestPolicy));
+  EXPECT_TRUE(cache_->Store(
+      "extension-policy", kTestExtension, CreateSerializedResponse()));
+  EXPECT_TRUE(cache_->Store(
+      "extension-policy-data", kTestExtension, kInvalidTestPolicy));
+
+  LoadStore();
+  InitializeRegistry();
+
+  // The initial, cached policy will be served once the backend is initialized.
+  EXPECT_CALL(delegate_, OnComponentCloudPolicyUpdated());
+  RunUntilIdle();
+  Mock::VerifyAndClearExpectations(&delegate_);
+
+  PolicyBundle expected_bundle;
+  const PolicyNamespace ns(POLICY_DOMAIN_EXTENSIONS, kTestExtension);
+  expected_bundle.Get(ns).Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                              base::Value::CreateStringValue("published"),
+                              NULL);
+  EXPECT_TRUE(service_->policy().Equals(expected_bundle)) << service_->policy();
+}
+
 }  // namespace policy