4 files changed, 14 insertions, 14 deletions
diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp
index 7ec77ed..794c118 100644
--- a/Source/WebKit/android/jni/ViewStateSerializer.cpp
+++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp
@@ -27,10 +27,10 @@
 
 #include "BaseLayerAndroid.h"
 #include "CreateJavaOutputStreamAdaptor.h"
+#include "Layer.h"
 #include "LayerAndroid.h"
 #include "PictureSet.h"
 #include "ScrollableLayerAndroid.h"
-#include "SkLayer.h"
 #include "SkPicture.h"
 
 #include <JNIUtility.h>
@@ -256,7 +256,7 @@ void serializeLayer(LayerAndroid* layer, SkWStream* stream)
             : LTLayerAndroid;
     stream->write8(type);
 
-    // Start with SkLayer fields
+    // Start with Layer fields
     stream->writeBool(layer->isInheritFromRootTransform());
     stream->writeScalar(layer->getOpacity());
     stream->writeScalar(layer->getSize().width());
@@ -337,7 +337,7 @@ LayerAndroid* deserializeLayer(SkStream* stream)
         return 0;
     }
 
-    // SkLayer fields
+    // Layer fields
     layer->setInheritFromRootTransform(stream->readBool());
     layer->setOpacity(stream->readScalar());
     layer->setSize(stream->readScalar(), stream->readScalar());
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index fb558c6..bdb502e 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -124,7 +124,7 @@
 #endif
 
 #if ENABLE(WEB_AUTOFILL)
-#include "autofill/WebAutoFill.h"
+#include "autofill/WebAutofill.h"
 #endif
 
 using namespace JSC::Bindings;
@@ -1334,7 +1334,7 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss
     WebViewCore* webViewCore = new WebViewCore(env, javaview, frame);
 
 #if ENABLE(WEB_AUTOFILL)
-    editorC->getAutoFill()->setWebViewCore(webViewCore);
+    editorC->getAutofill()->setWebViewCore(webViewCore);
 #endif
 
     // Create a FrameView
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp
index 6f18695..589615d 100644
--- a/Source/WebKit/android/jni/WebSettings.cpp
+++ b/Source/WebKit/android/jni/WebSettings.cpp
@@ -293,7 +293,7 @@ inline string16 getStringFieldAsString16(JNIEnv* env, jobject autoFillProfile, j
     return str ? jstringToString16(env, str) : string16();
 }
 
-void syncAutoFillProfile(JNIEnv* env, jobject autoFillProfile, WebAutoFill* webAutoFill)
+void syncAutoFillProfile(JNIEnv* env, jobject autoFillProfile, WebAutofill* webAutofill)
 {
     string16 fullName = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileFullName);
     string16 emailAddress = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileEmailAddress);
@@ -306,7 +306,7 @@ void syncAutoFillProfile(JNIEnv* env, jobject autoFillProfile, WebAutoFill* webA
     string16 country = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileCountry);
     string16 phoneNumber = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfilePhoneNumber);
 
-    webAutoFill->setProfile(fullName, emailAddress, companyName, addressLine1, addressLine2, city, state, zipCode, country, phoneNumber);
+    webAutofill->setProfile(fullName, emailAddress, companyName, addressLine1, addressLine2, city, state, zipCode, country, phoneNumber);
 }
 #endif
 
@@ -554,16 +554,16 @@ public:
 
         if (flag) {
             EditorClientAndroid* editorC = static_cast<EditorClientAndroid*>(pFrame->page()->editorClient());
-            WebAutoFill* webAutoFill = editorC->getAutoFill();
-            // Set the active AutoFillProfile data.
+            WebAutofill* webAutofill = editorC->getAutofill();
+            // Set the active AutofillProfile data.
             jobject autoFillProfile = env->GetObjectField(obj, gFieldIds->mAutoFillProfile);
             if (autoFillProfile)
-                syncAutoFillProfile(env, autoFillProfile, webAutoFill);
+                syncAutoFillProfile(env, autoFillProfile, webAutofill);
             else {
                 // The autofill profile is null. We need to tell Chromium about this because
                 // this may be because the user just deleted their profile but left the
                 // autofill feature setting enabled.
-                webAutoFill->clearProfiles();
+                webAutofill->clearProfiles();
             }
         }
 #endif
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 96045c6..966a540 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -117,7 +117,7 @@
 #include "WebFrameView.h"
 #include "WindowsKeyboardCodes.h"
 #include "android_graphics.h"
-#include "autofill/WebAutoFill.h"
+#include "autofill/WebAutofill.h"
 #include "htmlediting.h"
 #include "markup.h"
 
@@ -3279,7 +3279,7 @@ bool WebViewCore::handleMouseClick(WebCore::Frame* framePtr, WebCore::Node* node
 #if ENABLE(WEB_AUTOFILL)
                 if (renderer->isTextField()) {
                     EditorClientAndroid* editorC = static_cast<EditorClientAndroid*>(framePtr->page()->editorClient());
-                    WebAutoFill* autoFill = editorC->getAutoFill();
+                    WebAutofill* autoFill = editorC->getAutofill();
                     autoFill->formFieldFocused(static_cast<HTMLFormControlElement*>(focusNode));
                 }
 #endif
@@ -4566,7 +4566,7 @@ static void AutoFillForm(JNIEnv* env, jobject obj, jint queryId)
     WebCore::Frame* frame = viewImpl->mainFrame();
     if (frame) {
         EditorClientAndroid* editorC = static_cast<EditorClientAndroid*>(frame->page()->editorClient());
-        WebAutoFill* autoFill = editorC->getAutoFill();
+        WebAutofill* autoFill = editorC->getAutofill();
         autoFill->fillFormFields(queryId);
     }
 #endif