Restore formatting in configuration_policy_handler_list_factory

Restore formatting in configuration_policy_handler_list_factory

Restore manual formatting in the kSimplePolicyMap array initializer and
add clang-format off and clang-format on sentinels to prevent accidental
reformatting in the future.

BUG=none

Review-Url: https://codereview.chromium.org/2628653003
Cr-Commit-Position: refs/heads/master@{#443196}
Committed: https://chromium.googlesource.com/chromium/src/+/0deb194b2774d9a68a7fcba1d4fe17477767c7c1

[pmarko, 2017-01-11 12:39:29]

pmarko@chromium.org changed reviewers:
+ pastarmovj@chromium.org

[pmarko, 2017-01-11 12:39:29]

Proposal to restore formatting in configuration_policy_handler_list_factory.cc.

For simplicity, here's the patch to the revision before the accidental
formatting:

diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index c028993d07a2..8faf6fbbe6c1 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -58,7 +58,7 @@
 #include "media/media_features.h"
 #include "ppapi/features/features.h"
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
 #include "chrome/browser/search/contextual_search_policy_handler_android.h"
 #endif
 
@@ -100,6 +100,7 @@ namespace {
 
 // List of policy types to preference names. This is used for simple policies
 // that directly map to a single preference.
+// clang-format off
 const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kHomepageLocation,
     prefs::kHomePage,
@@ -125,6 +126,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kPacHttpsUrlStrippingEnabled,
     prefs::kPacHttpsUrlStrippingEnabled,
     base::Value::Type::BOOLEAN },
+  { key::kQuicAllowed,
+    prefs::kQuicAllowed,
+    base::Value::Type::BOOLEAN },
   { key::kSafeBrowsingEnabled,
     prefs::kSafeBrowsingEnabled,
     base::Value::Type::BOOLEAN },
@@ -554,14 +558,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     base::Value::Type::BOOLEAN },
 #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
   { key::kDataCompressionProxyEnabled,
     prefs::kDataSaverEnabled,
     base::Value::Type::BOOLEAN },
   { key::kAuthAndroidNegotiateAccountType,
     prefs::kAuthAndroidNegotiateAccountType,
     base::Value::Type::STRING },
-#endif  // BUILDFLAG(ANDROID_JAVA_UI)
+#endif  // defined(OS_ANDROID)
 
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   { key::kNativeMessagingUserLevelHosts,
@@ -631,6 +635,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     syncer::prefs::kLocalSyncBackendDir,
     base::Value::Type::STRING },
 };
+// clang-format on
 
 class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler {
  public:
@@ -816,7 +821,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList>
BuildHandlerList(
       SCHEMA_STRICT, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
       SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
 
-#if BUILDFLAG(ANDROID_JAVA_UI)
+#if defined(OS_ANDROID)
   handlers->AddHandler(
       base::MakeUnique<ContextualSearchPolicyHandlerAndroid>());
 #endif


Explanations:
- Reapplying what was intended in db4a58e gives us the ANDROID_JAVA_UI ->
OS_ANDROID changes
- Reapplying what was intended in 6ab8be24 gives us the kQuicAllowed change
- I've added the clang-format off/clang-format on sentinels

[pastarmovj, 2017-01-12 08:20:08]

lgtm

[pmarko, 2017-01-12 09:22:50]

The CQ bit was checked by pmarko@chromium.org

[commit-bot: I haz the power, 2017-01-12 09:23:04]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-12 10:22:23]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1484212970844040, "parent_rev":
"51ed0d54153a164e68155447fcd1cfcb393f1870", "commit_rev":
"0deb194b2774d9a68a7fcba1d4fe17477767c7c1"}

[commit-bot: I haz the power, 2017-01-12 10:23:04]

Description was changed from

==========
Restore formatting in configuration_policy_handler_list_factory

Restore manual formatting in the kSimplePolicyMap array initializer and
add clang-format off and clang-format on sentinels to prevent accidental
reformatting in the future.

BUG=none
==========

to

==========
Restore formatting in configuration_policy_handler_list_factory

Restore manual formatting in the kSimplePolicyMap array initializer and
add clang-format off and clang-format on sentinels to prevent accidental
reformatting in the future.

BUG=none

Review-Url: https://codereview.chromium.org/2628653003
Cr-Commit-Position: refs/heads/master@{#443196}
Committed:
https://chromium.googlesource.com/chromium/src/+/0deb194b2774d9a68a7fcba1d4fe...
==========

[commit-bot: I haz the power, 2017-01-12 10:23:05]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/0deb194b2774d9a68a7fcba1d4fe...