Green Tree Tactical Force: Revert skrul's bad commits (probably a git-cl bug).

chrome/common/pref_names.cc

 // Copyright (c) 2010 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/common/pref_names.h"
 
 namespace prefs {
 
 // *************** PROFILE PREFS ***************
 // These are attached to the user profile
@@ skipping 870 matching lines @@
 const wchar_t kSyncPreferences[] = L"sync.preferences";
 const wchar_t kSyncAutofill[] = L"sync.autofill";
 const wchar_t kSyncThemes[] = L"sync.themes";
 const wchar_t kSyncTypedUrls[] = L"sync.typed_urls";
 const wchar_t kSyncExtensions[] = L"sync.extensions";
 
 // Boolean used by enterprise configuration management in order to lock down
 // sync.
 const wchar_t kSyncManaged[] = L"sync.managed";
 
-// Boolean to prevent sync from automatically starting up.  This is
-// used when sync is disabled by the user via the privacy dashboard.
-const wchar_t kSyncSuppressStart[] = L"sync.suppress_start";
-
 // Create web application shortcut dialog preferences.
 const wchar_t kWebAppCreateOnDesktop[] = L"browser.web_app.create_on_desktop";
 const wchar_t kWebAppCreateInAppsMenu[] =
     L"browser.web_app.create_in_apps_menu";
 const wchar_t kWebAppCreateInQuickLaunchBar[] =
     L"browser.web_app.create_in_quick_launch_bar";
 
 // Dictionary that maps Geolocation network provider server URLs to
 // corresponding access token.
 const wchar_t kGeolocationAccessToken[] = L"geolocation.access_token";
@@ skipping 35 matching lines @@
 // String specifying the proxy server. For a specification of the expected
 // syntax see net::ProxyConfig::ProxyRules::ParseFromString().
 const wchar_t kProxyServer[] = L"proxy.server";
 // URL to the proxy .pac file.
 const wchar_t kProxyPacUrl[] = L"proxy.pac_url";
 // String containing proxy bypass rules. For a specification of the
 // expected syntax see net::ProxyBypassRules::ParseFromString().
 const wchar_t kProxyBypassList[] = L"proxy.bypass_list";
 
 }  // namespace prefs