ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool.

third_party/WebKit/Source/web/WebSettingsImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
       m_clobberUserAgentInitialScaleQuirk(false),
       m_expensiveBackgroundThrottlingCPUBudget(-1),
       m_expensiveBackgroundThrottlingInitialBudget(-1),
       m_expensiveBackgroundThrottlingMaxBudget(-1),
       m_expensiveBackgroundThrottlingMaxDelay(-1) {
   DCHECK(settings);
 }
 
 void WebSettingsImpl::setFromStrings(const WebString& name,
                                      const WebString& value) {
+  /* DO NOT SUBMIT - merge conflict marker.
+   * Please spell |setFromStrings|, not |SetFromStrings| below. */
   m_settings->setFromStrings(name, value);
 }
 
 void WebSettingsImpl::setStandardFontFamily(const WebString& font,
                                             UScriptCode script) {
   if (m_settings->genericFontFamilySettings().updateStandard(font, script))
     m_settings->notifyGenericFontFamilyChange();
 }
 
 void WebSettingsImpl::setFixedFontFamily(const WebString& font,
@@ skipping 648 matching lines @@
 void WebSettingsImpl::setMediaControlsEnabled(bool enabled) {
   m_settings->setMediaControlsEnabled(enabled);
 }
 
 void WebSettingsImpl::setDoNotUpdateSelectionOnMutatingSelectionRange(
     bool enabled) {
   m_settings->setDoNotUpdateSelectionOnMutatingSelectionRange(enabled);
 }
 
 }  // namespace blink