Set configuration_policy=1 on Android.

BUG=247435

Review URL: https://chromiumcodereview.appspot.com/19482020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213284 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -1295,7 +1295,6 @@
         'proprietary_codecs%': '<(proprietary_codecs)',
         'enable_task_manager%': 0,
         'safe_browsing%': 2,
-        'configuration_policy%': 0,
         'input_speech%': 0,
         'enable_automation%': 0,
         'java_bridge%': 1,

chrome/browser/policy/policy_statistics_collector_unittest.cc

@@ -34,7 +34,7 @@ using testing::Return;
 using testing::ReturnRef;
 
 // Arbitrary policy names used for testing.
-const char* const kTestPolicy1 = key::kHomepageIsNewTabPage;
+const char* const kTestPolicy1 = key::kAlternateErrorPagesEnabled;
 const char* const kTestPolicy2 = key::kSearchSuggestEnabled;
 
 class TestPolicyStatisticsCollector : public PolicyStatisticsCollector {