Upstream privacy settings.

chrome/android/java/res/xml/do_not_track_preferences.xml

Index: chrome/android/java/res/xml/do_not_track_preferences.xml
diff --git a/chrome/android/java/res/xml/protected_content_preferences.xml b/chrome/android/java/res/xml/do_not_track_preferences.xml
similarity index 57%
copy from chrome/android/java/res/xml/protected_content_preferences.xml
copy to chrome/android/java/res/xml/do_not_track_preferences.xml
index a401ca487befc06784fc39ab4d20a7bd70dcbecd..5bbad1ea75dd0fdc48d24554a4a27e305cd95a19 100644
--- a/chrome/android/java/res/xml/protected_content_preferences.xml
+++ b/chrome/android/java/res/xml/do_not_track_preferences.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+<!-- Copyright 2015 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. -->
 
@@ -8,21 +8,17 @@
     xmlns:chrome="http://schemas.android.com/apk/res-auto">
 
     <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
-        android:key="protected_content_switch"
+        android:key="do_not_track_switch"
         android:summaryOn="@string/text_on"
         android:summaryOff="@string/text_off" />
 
     <org.chromium.chrome.browser.preferences.TextMessagePreference
-        android:title="@string/protected_content_prefs_description" />
+        android:title="@string/do_not_track_description" />
 
     <org.chromium.chrome.browser.preferences.HyperlinkPreference
-        android:key="protected_content_learn_more"
+        android:key="do_not_track_learn_more"
         android:title="@string/learn_more"
-        chrome:url="@string/protected_content_learn_more_url"
+        chrome:url="@string/do_not_track_learn_more_url"
         chrome:imitateWebLink="true" />
 
-    <org.chromium.chrome.browser.preferences.ButtonPreference
-        android:key="reset_device_credentials_button"
-        android:title="@string/reset_device_credentials" />
-
 </PreferenceScreen>