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

third_party/WebKit/public/platform/WebData.h

 /*
  * 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 65 matching lines @@
   bool isEmpty() const { return !size(); }
   bool isNull() const { return m_private.isNull(); }
 
 #if INSIDE_BLINK
   WebData(PassRefPtr<SharedBuffer>);
   WebData& operator=(PassRefPtr<SharedBuffer>);
   operator PassRefPtr<SharedBuffer>() const;
 #else
   template <class C>
   WebData(const C& c) {
+    /* DO NOT SUBMIT - merge conflict marker
+     * Please spell |data| and |size| (rather than |Data| and |Size|) below. */
     assign(c.data(), c.size());
   }
 
   template <class C>
   WebData& operator=(const C& c) {
+    /* DO NOT SUBMIT - merge conflict marker
+     * Please spell |data| and |size| (rather than |Data| and |Size|) below. */
     assign(c.data(), c.size());
     return *this;
   }
 #endif
 
  private:
   WebPrivatePtr<SharedBuffer> m_private;
 };
 
 }  // namespace blink
 
 #endif