Small cleanups in the Mojo HTML viewer

mojo/services/html_viewer/webclipboard_impl.cc

 // Copyright 2014 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 "mojo/services/html_viewer/webclipboard_impl.h"
 
 #include "base/bind.h"
 #include "mojo/services/html_viewer/blink_basic_type_converters.h"
 
 using mojo::Array;
@@ skipping 82 matching lines @@
     case FormatBookmark:
       // This might be difficult.
       return false;
   }
 
   return false;
 }
 
 blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes(
     Buffer buffer,
-    bool* containsFilenames) {
+    bool* contains_filenames) {
   Clipboard::Type clipboard_type = ConvertBufferType(buffer);
 
   std::vector<std::string> types;
   clipboard_->GetAvailableMimeTypes(
       clipboard_type, base::Bind(&CopyVectorString, &types));
 
   // Force this to be synchronous.
   clipboard_.WaitForIncomingMethodCall();
 
-  // AFAICT, every instance of setting containsFilenames is false.
-  *containsFilenames = false;
+  // AFAICT, every instance of setting contains_filenames is false.
+  *contains_filenames = false;
 
   blink::WebVector<blink::WebString> output(types.size());
   for (size_t i = 0; i < types.size(); ++i) {
     output[i] = blink::WebString::fromUTF8(types[i]);
   }
 
   return output;
 }
 
 blink::WebString WebClipboardImpl::readPlainText(Buffer buffer) {
   Clipboard::Type type = ConvertBufferType(buffer);
 
   blink::WebString text;
   clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_TEXT,
                            base::Bind(&CopyWebString, &text));
 
   // Force this to be synchronous.
   clipboard_.WaitForIncomingMethodCall();
 
   return text;
 }
 
 blink::WebString WebClipboardImpl::readHTML(Buffer buffer,
-                                            blink::WebURL* pageURL,
-                                            unsigned* fragmentStart,
-                                            unsigned* fragmentEnd) {
+                                            blink::WebURL* page_url,
+                                            unsigned* fragment_start,
+                                            unsigned* fragment_end) {
   Clipboard::Type type = ConvertBufferType(buffer);
 
   blink::WebString html;
   clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_HTML,
                            base::Bind(&CopyWebString, &html));
   clipboard_.WaitForIncomingMethodCall();
 
-  *fragmentStart = 0;
-  *fragmentEnd = static_cast<unsigned>(html.length());
+  *fragment_start = 0;
+  *fragment_end = static_cast<unsigned>(html.length());
 
   clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_URL,
-                           base::Bind(&CopyURL, pageURL));
+                           base::Bind(&CopyURL, page_url));
   clipboard_.WaitForIncomingMethodCall();
 
   return html;
 }
 
 blink::WebString WebClipboardImpl::readCustomData(
     Buffer buffer,
     const blink::WebString& mime_type) {
   Clipboard::Type clipboard_type = ConvertBufferType(buffer);
 
   blink::WebString data;
   clipboard_->ReadMimeType(
       clipboard_type, mime_type.utf8(), base::Bind(&CopyWebString, &data));
 
   // Force this to be synchronous.
   clipboard_.WaitForIncomingMethodCall();
 
   return data;
 }
 
-void WebClipboardImpl::writePlainText(const blink::WebString& text) {
+void WebClipboardImpl::writePlainText(const blink::WebString& plain_text) {
   Map<String, Array<uint8_t>> data;
-  data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(text);
+  data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plain_text);
 
   clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE, data.Pass());
 }
 
-void WebClipboardImpl::writeHTML(const blink::WebString& htmlText,
-                                 const blink::WebURL& url,
-                                 const blink::WebString& plainText,
+void WebClipboardImpl::writeHTML(const blink::WebString& html_text,
+                                 const blink::WebURL& source_url,
+                                 const blink::WebString& plain_text,
                                  bool writeSmartPaste) {
   Map<String, Array<uint8_t>> data;
-  data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plainText);
-  data[Clipboard::MIME_TYPE_HTML] = Array<uint8_t>::From(htmlText);
-  data[Clipboard::MIME_TYPE_URL] = Array<uint8_t>::From(url.string());
+  data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plain_text);
+  data[Clipboard::MIME_TYPE_HTML] = Array<uint8_t>::From(html_text);
+  data[Clipboard::MIME_TYPE_URL] = Array<uint8_t>::From(source_url.string());
 
   if (writeSmartPaste)
     data[kMimeTypeWebkitSmartPaste] = Array<uint8_t>::From(blink::WebString());
 
   clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE, data.Pass());
 }
 
 Clipboard::Type WebClipboardImpl::ConvertBufferType(Buffer buffer) {
   switch (buffer) {
     case BufferStandard:
       return Clipboard::TYPE_COPY_PASTE;
     case BufferSelection:
       return Clipboard::TYPE_SELECTION;
   }
 
   NOTREACHED();
   return Clipboard::TYPE_COPY_PASTE;
 }
 
 }  // namespace html_viewer