Move the cloud policy protobufs into the component.

components/policy/core/common/cloud/policy_builder.cc

 // Copyright (c) 2012 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 "components/policy/core/common/cloud/policy_builder.h"
 
 #include <vector>
 
 #include "base/stl_util.h"
-#include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "crypto/signature_creator.h"
-#include "policy/proto/cloud_policy.pb.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 namespace {
 
 // Signing key test data in DER-encoded PKCS8 format.
 const uint8 kSigningKey[] = {
     0x30, 0x82, 0x01, 0x55, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a,
@@ skipping 196 matching lines @@
       reinterpret_cast<const char*>(vector_as_array(&signature_bytes)),
       signature_bytes.size());
 }
 
 template<>
 TypedPolicyBuilder<em::CloudPolicySettings>::TypedPolicyBuilder()
     : payload_(new em::CloudPolicySettings()) {
   policy_data().set_policy_type(dm_protocol::kChromeUserPolicyType);
 }
 
+// Have the instantiation compiled into the module.
+template class TypedPolicyBuilder<em::CloudPolicySettings>;
+
+#if !defined(OS_ANDROID)
 template<>
 TypedPolicyBuilder<em::ExternalPolicyData>::TypedPolicyBuilder()
     : payload_(new em::ExternalPolicyData()) {
   policy_data().set_policy_type(dm_protocol::kChromeExtensionPolicyType);
 }
 
-
-// Have the instantiations compiled into the module.
-template class TypedPolicyBuilder<em::CloudPolicySettings>;
 template class TypedPolicyBuilder<em::ExternalPolicyData>;
+#endif
 
 }  // namespace policy