Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I821098330652380686aca9e83222936bd5678970

9 files changed, 65 insertions, 65 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 0be31eb..8cf0131 100644
--- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -267,11 +267,11 @@ void FrameLoaderClientAndroid::dispatchDidReceiveIcon() {
     // There is a bug in webkit where cancelling an icon load is treated as a
     // failure. When this is fixed, we can ASSERT again that we have an icon.
     if (icon) {
-        LOGV("Received icon (%p) for %s", icon,
+        ALOGV("Received icon (%p) for %s", icon,
                 url.utf8().data());
         m_webFrame->didReceiveIcon(icon);
     } else {
-        LOGV("Icon data for %s unavailable, registering for notification...",
+        ALOGV("Icon data for %s unavailable, registering for notification...",
                 url.utf8().data());
         registerForIconNotification();
     }
@@ -1016,7 +1016,7 @@ WTF::PassRefPtr<WebCore::Frame> FrameLoaderClientAndroid::createFrame(const KURL
     newFrame->setView(frameView);
     newFrame->init();
     newFrame->selection()->setFocused(true);
-    LOGV("::WebCore:: createSubFrame returning %p", newFrame);
+    ALOGV("::WebCore:: createSubFrame returning %p", newFrame);
 
     // The creation of the frame may have run arbitrary JavaScript that removed it from the page already.
     if (!pFrame->page())
@@ -1331,7 +1331,7 @@ void FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld(DOMWrapperWor
         return;
 
     ASSERT(m_frame);
-    LOGV("::WebCore:: windowObjectCleared called on frame %p for %s\n",
+    ALOGV("::WebCore:: windowObjectCleared called on frame %p for %s\n",
     		m_frame, m_frame->loader()->url().string().ascii().data());
     m_webFrame->windowObjectCleared(m_frame);
 }
diff --git a/Source/WebKit/android/jni/JavaBridge.cpp b/Source/WebKit/android/jni/JavaBridge.cpp
index 68eb367..91f1e07 100644
--- a/Source/WebKit/android/jni/JavaBridge.cpp
+++ b/Source/WebKit/android/jni/JavaBridge.cpp
@@ -364,7 +364,7 @@ void JavaBridge::Finalize(JNIEnv* env, jobject obj)
     JavaBridge* javaBridge = (JavaBridge*)
         (env->GetIntField(obj, gJavaBridge_ObjectID));    
     LOG_ASSERT(javaBridge, "Finalize should not be called twice for the same java bridge!");
-    LOGV("webcore_javabridge::nativeFinalize(%p)\n", javaBridge);
+    ALOGV("webcore_javabridge::nativeFinalize(%p)\n", javaBridge);
     delete javaBridge;
     env->SetIntField(obj, gJavaBridge_ObjectID, 0);
 }
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index bb28d28..a01cca2 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -425,7 +425,7 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader,
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: startLoadingResource(%p, %s)",
+    ALOGV("::WebCore:: startLoadingResource(%p, %s)",
             loader, request.url().string().latin1().data());
 
     JNIEnv* env = getJNIEnv();
@@ -449,7 +449,7 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader,
                     + urlStr.substring(colon);
         }
     }
-    LOGV("%s lower=%s", __FUNCTION__, urlStr.latin1().data());
+    ALOGV("%s lower=%s", __FUNCTION__, urlStr.latin1().data());
     jstring jUrlStr = wtfStringToJstring(env, urlStr);
     jstring jMethodStr = NULL;
     if (!method.isEmpty())
@@ -475,7 +475,7 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader,
             break;
     }
 
-    LOGV("::WebCore:: startLoadingResource %s with cacheMode %d", urlStr.ascii().data(), cacheMode);
+    ALOGV("::WebCore:: startLoadingResource %s with cacheMode %d", urlStr.ascii().data(), cacheMode);
 
     ResourceHandleInternal* loaderInternal = loader->getInternal();
     jstring jUsernameString = loaderInternal->m_user.isEmpty() ?
@@ -513,7 +513,7 @@ WebFrame::shouldInterceptRequest(const WTF::String& url)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: shouldInterceptRequest(%s)", url.latin1().data());
+    ALOGV("::WebCore:: shouldInterceptRequest(%s)", url.latin1().data());
 
     JNIEnv* env = getJNIEnv();
     AutoJObject javaFrame = mJavaFrame->frame(env);
@@ -537,7 +537,7 @@ WebFrame::reportError(int errorCode, const WTF::String& description,
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: reportError(%d, %s)", errorCode, description.ascii().data());
+    ALOGV("::WebCore:: reportError(%d, %s)", errorCode, description.ascii().data());
     JNIEnv* env = getJNIEnv();
     AutoJObject javaFrame = mJavaFrame->frame(env);
     if (!javaFrame.get())
@@ -589,7 +589,7 @@ WebFrame::loadStarted(WebCore::Frame* frame)
     const WebCore::KURL& url = documentLoader->url();
     if (url.isEmpty())
         return;
-    LOGV("::WebCore:: loadStarted %s", url.string().ascii().data());
+    ALOGV("::WebCore:: loadStarted %s", url.string().ascii().data());
 
     bool isMainFrame = (!frame->tree() || !frame->tree()->parent());
     WebCore::FrameLoadType loadType = frame->loader()->loadType();
@@ -609,7 +609,7 @@ WebFrame::loadStarted(WebCore::Frame* frame)
         WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(urlString, WebCore::IntSize(16, 16));
         if (icon)
             favicon = webcoreImageToJavaBitmap(env, icon);
-        LOGV("favicons", "Starting load with icon %p for %s", icon, url.string().utf8().data());
+        ALOGV("favicons", "Starting load with icon %p for %s", icon, url.string().utf8().data());
     }
     jstring urlStr = wtfStringToJstring(env, urlString);
 
@@ -667,7 +667,7 @@ WebFrame::didFinishLoad(WebCore::Frame* frame)
     const WebCore::KURL& url = documentLoader->url();
     if (url.isEmpty())
         return;
-    LOGV("::WebCore:: didFinishLoad %s", url.string().ascii().data());
+    ALOGV("::WebCore:: didFinishLoad %s", url.string().ascii().data());
 
     bool isMainFrame = (!frame->tree() || !frame->tree()->parent());
     WebCore::FrameLoadType loadType = loader->loadType();
@@ -684,7 +684,7 @@ WebFrame::addHistoryItem(WebCore::HistoryItem* item)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: addHistoryItem");
+    ALOGV("::WebCore:: addHistoryItem");
     JNIEnv* env = getJNIEnv();
     WebHistory::AddItem(mJavaFrame->history(env), item);
 }
@@ -695,7 +695,7 @@ WebFrame::removeHistoryItem(int index)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: removeHistoryItem at %d", index);
+    ALOGV("::WebCore:: removeHistoryItem at %d", index);
     JNIEnv* env = getJNIEnv();
     WebHistory::RemoveItem(mJavaFrame->history(env), index);
 }
@@ -706,7 +706,7 @@ WebFrame::updateHistoryIndex(int newIndex)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: updateHistoryIndex to %d", newIndex);
+    ALOGV("::WebCore:: updateHistoryIndex to %d", newIndex);
     JNIEnv* env = getJNIEnv();
     WebHistory::UpdateHistoryIndex(mJavaFrame->history(env), newIndex);
 }
@@ -718,7 +718,7 @@ WebFrame::setTitle(const WTF::String& title)
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
 #ifndef NDEBUG
-    LOGV("setTitle(%s)", title.ascii().data());
+    ALOGV("setTitle(%s)", title.ascii().data());
 #endif
     JNIEnv* env = getJNIEnv();
     AutoJObject javaFrame = mJavaFrame->frame(env);
@@ -738,7 +738,7 @@ WebFrame::windowObjectCleared(WebCore::Frame* frame)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
 #endif
-    LOGV("::WebCore:: windowObjectCleared");
+    ALOGV("::WebCore:: windowObjectCleared");
     JNIEnv* env = getJNIEnv();
     AutoJObject javaFrame = mJavaFrame->frame(env);
     if (!javaFrame.get())
@@ -1362,7 +1362,7 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss
     WebCore::SecurityOrigin::setLocalLoadPolicy(
             WebCore::SecurityOrigin::AllowLocalLoadsForLocalAndSubstituteData);
 
-    LOGV("::WebCore:: createFrame %p", frame);
+    ALOGV("::WebCore:: createFrame %p", frame);
 
     // Set the mNativeFrame field in Frame
     SET_NATIVE_FRAME(env, obj, (int)frame);
@@ -1390,7 +1390,7 @@ static void DestroyFrame(JNIEnv* env, jobject obj)
     WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
     LOG_ASSERT(pFrame, "nativeDestroyFrame must take a valid frame pointer!");
 
-    LOGV("::WebCore:: deleting frame %p", pFrame);
+    ALOGV("::WebCore:: deleting frame %p", pFrame);
 
     WebCore::FrameView* view = pFrame->view();
     view->ref();
@@ -1463,7 +1463,7 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url, jobject headers)
         env->DeleteLocalRef(set);
         env->DeleteLocalRef(mapClass);
     }
-    LOGV("LoadUrl %s", kurl.string().latin1().data());
+    ALOGV("LoadUrl %s", kurl.string().latin1().data());
     pFrame->loader()->load(request, false);
 }
 
@@ -1491,7 +1491,7 @@ static void PostUrl(JNIEnv *env, jobject obj, jstring url, jbyteArray postData)
         env->ReleaseByteArrayElements(postData, bytes, 0);
     }
 
-    LOGV("PostUrl %s", kurl.string().latin1().data());
+    ALOGV("PostUrl %s", kurl.string().latin1().data());
     WebCore::FrameLoadRequest frameRequest(pFrame->document()->securityOrigin(), request);
     pFrame->loader()->loadFrameRequest(frameRequest, false, false, 0, 0, WebCore::SendReferrer);
 }
@@ -1531,7 +1531,7 @@ static void StopLoading(JNIEnv *env, jobject obj)
 #endif
     WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
     LOG_ASSERT(pFrame, "nativeStopLoading must take a valid frame pointer!");
-    LOGV("::WebCore:: stopLoading %p", pFrame);
+    ALOGV("::WebCore:: stopLoading %p", pFrame);
 
     // Stop loading the page and do not send an unload event
     pFrame->loader()->stopForUserCancel();
@@ -1843,7 +1843,7 @@ static void AddJavascriptInterface(JNIEnv *env, jobject obj, jint nativeFramePoi
 
     JavaVM* vm;
     env->GetJavaVM(&vm);
-    LOGV("::WebCore:: addJSInterface: %p", pFrame);
+    ALOGV("::WebCore:: addJSInterface: %p", pFrame);
 
 #if USE(JSC)
     // Copied from qwebframe.cpp
@@ -2113,7 +2113,7 @@ static void OrientationChanged(JNIEnv *env, jobject obj, int orientation)
     TimeCounterAuto counter(TimeCounter::NativeCallbackTimeCounter);
 #endif
     WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
-    LOGV("Sending orientation: %d", orientation);
+    ALOGV("Sending orientation: %d", orientation);
     pFrame->sendOrientationChangeEvent(orientation);
 }
 
diff --git a/Source/WebKit/android/jni/WebCoreResourceLoader.cpp b/Source/WebKit/android/jni/WebCoreResourceLoader.cpp
index f9acc97..7845533 100644
--- a/Source/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/Source/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -158,11 +158,11 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
     WTF::String mimeTypeStr;
     if (mimeType) {
         mimeTypeStr = jstringToWtfString(env, mimeType);
-        LOGV("Response setMIMEType: %s", mimeTypeStr.latin1().data());
+        ALOGV("Response setMIMEType: %s", mimeTypeStr.latin1().data());
     }
     if (encoding) {
         encodingStr = jstringToWtfString(env, encoding);
-        LOGV("Response setTextEncodingName: %s", encodingStr.latin1().data());
+        ALOGV("Response setTextEncodingName: %s", encodingStr.latin1().data());
     }
     WebCore::ResourceResponse* response = new WebCore::ResourceResponse(
             kurl, mimeTypeStr, (long long)expectedLength,
@@ -171,7 +171,7 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
     if (statusText) {
         WTF::String status = jstringToWtfString(env, statusText);
         response->setHTTPStatusText(status);
-        LOGV("Response setStatusText: %s", status.latin1().data());
+        ALOGV("Response setStatusText: %s", status.latin1().data());
     }
     return (int)response;
 }
@@ -199,7 +199,7 @@ void WebCoreResourceLoader::AddData(JNIEnv* env, jobject obj, jbyteArray dataArr
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
 #endif
-    LOGV("webcore_resourceloader data(%d)", length);
+    ALOGV("webcore_resourceloader data(%d)", length);
 
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
     LOG_ASSERT(handle, "nativeAddData must take a valid handle!");
@@ -222,7 +222,7 @@ void WebCoreResourceLoader::Finished(JNIEnv* env, jobject obj)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
 #endif
-    LOGV("webcore_resourceloader finished");
+    ALOGV("webcore_resourceloader finished");
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
     LOG_ASSERT(handle, "nativeFinished must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
@@ -239,7 +239,7 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
 #endif
-    LOGV("webcore_resourceloader redirectedToUrl");
+    ALOGV("webcore_resourceloader redirectedToUrl");
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
     LOG_ASSERT(handle, "nativeRedirectedToUrl must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
@@ -278,7 +278,7 @@ void WebCoreResourceLoader::Error(JNIEnv* env, jobject obj, jint id, jstring des
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
 #endif
-    LOGV("webcore_resourceloader error");
+    ALOGV("webcore_resourceloader error");
     WebCore::ResourceHandle* handle = GET_NATIVE_HANDLE(env, obj);
     LOG_ASSERT(handle, "nativeError must take a valid handle!");
     // ResourceLoader::didFail() can set handle to be NULL, we need to check
diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp
index 7ec73a3..7e2e9b9 100644
--- a/Source/WebKit/android/jni/WebHistory.cpp
+++ b/Source/WebKit/android/jni/WebHistory.cpp
@@ -375,7 +375,7 @@ static void write_string(WTF::Vector<char>& v, const WTF::String& str)
         char* data = v.begin() + vectorLen;
         // Write the actual string
         int l = SkUTF16_ToUTF8(str.characters(), strLen, data);
-        LOGV("Writing string       %d %.*s", l, l, data);
+        ALOGV("Writing string       %d %.*s", l, l, data);
         // Go back and write the utf8 length. Subtract sizeof(unsigned) from
         // data to get the position to write the length.
         memcpy(data - sizeof(unsigned), (char*)&l, sizeof(unsigned));
@@ -417,10 +417,10 @@ static void write_item(WTF::Vector<char>& v, WebCore::HistoryItem* item)
     LOG_ASSERT(bridge, "We should have a bridge here!");
     // Screen scale
     const float scale = bridge->scale();
-    LOGV("Writing scale %f", scale);
+    ALOGV("Writing scale %f", scale);
     v.append((char*)&scale, sizeof(float));
     const float textWrapScale = bridge->textWrapScale();
-    LOGV("Writing text wrap scale %f", textWrapScale);
+    ALOGV("Writing text wrap scale %f", textWrapScale);
     v.append((char*)&textWrapScale, sizeof(float));
 
     // Scroll position.
@@ -433,19 +433,19 @@ static void write_item(WTF::Vector<char>& v, WebCore::HistoryItem* item)
     const WTF::Vector<WTF::String>& docState = item->documentState();
     WTF::Vector<WTF::String>::const_iterator end = docState.end();
     unsigned stateSize = docState.size();
-    LOGV("Writing docState     %d", stateSize);
+    ALOGV("Writing docState     %d", stateSize);
     v.append((char*)&stateSize, sizeof(unsigned));
     for (WTF::Vector<WTF::String>::const_iterator i = docState.begin(); i != end; ++i) {
         write_string(v, *i);
     }
 
     // Is target item
-    LOGV("Writing isTargetItem %d", item->isTargetItem());
+    ALOGV("Writing isTargetItem %d", item->isTargetItem());
     v.append((char)item->isTargetItem());
 
     // Children count
     unsigned childCount = item->children().size();
-    LOGV("Writing childCount   %d", childCount);
+    ALOGV("Writing childCount   %d", childCount);
     v.append((char*)&childCount, sizeof(unsigned));
 }
 
@@ -495,7 +495,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     // Increment data pointer by the size of an unsigned int.
     data += sizeofUnsigned;
     if (l) {
-        LOGV("Original url    %d %.*s", l, l, data);
+        ALOGV("Original url    %d %.*s", l, l, data);
         // If we have a length, check if that length exceeds the data length
         // and return null if there is not enough data.
         if (data + l < end)
@@ -513,7 +513,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     memcpy(&l, data, sizeofUnsigned);
     data += sizeofUnsigned;
     if (l) {
-        LOGV("Url             %d %.*s", l, l, data);
+        ALOGV("Url             %d %.*s", l, l, data);
         if (data + l < end)
             newItem->setURLString(e.decode(data, l));
         else
@@ -527,7 +527,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     memcpy(&l, data, sizeofUnsigned);
     data += sizeofUnsigned;
     if (l) {
-        LOGV("Title           %d %.*s", l, l, data);
+        ALOGV("Title           %d %.*s", l, l, data);
         if (data + l < end)
             newItem->setTitle(e.decode(data, l));
         else
@@ -545,7 +545,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     memcpy(&l, data, sizeofUnsigned);
     data += sizeofUnsigned;
     if (l) {
-        LOGV("Content type    %d %.*s", l, l, data);
+        ALOGV("Content type    %d %.*s", l, l, data);
         if (data + l < end)
             formContentType = e.decode(data, l);
         else
@@ -559,7 +559,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     memcpy(&l, data, sizeofUnsigned);
     data += sizeofUnsigned;
     if (l) {
-        LOGV("Form data       %d %.*s", l, l, data);
+        ALOGV("Form data       %d %.*s", l, l, data);
         if (data + l < end)
             formData = WebCore::FormData::create(data, l);
         else
@@ -591,7 +591,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     memcpy(&l, data, sizeofUnsigned);
     data += sizeofUnsigned;
     if (l) {
-        LOGV("Target          %d %.*s", l, l, data);
+        ALOGV("Target          %d %.*s", l, l, data);
         if (data + l < end)
             newItem->setTarget(e.decode(data, l));
         else
@@ -606,11 +606,11 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     float fValue;
     // Read the screen scale
     memcpy(&fValue, data, sizeof(float));
-    LOGV("Screen scale    %f", fValue);
+    ALOGV("Screen scale    %f", fValue);
     bridge->setScale(fValue);
     data += sizeof(float);
     memcpy(&fValue, data, sizeofUnsigned);
-    LOGV("Text wrap scale    %f", fValue);
+    ALOGV("Text wrap scale    %f", fValue);
     bridge->setTextWrapScale(fValue);
     data += sizeof(float);
 
@@ -631,7 +631,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
 
     // Read the document state
     memcpy(&l, data, sizeofUnsigned);
-    LOGV("Document state  %d", l);
+    ALOGV("Document state  %d", l);
     data += sizeofUnsigned;
     if (l) {
         // Check if we have enough data to at least parse the sizes of each
@@ -653,7 +653,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
                 docState.append(e.decode(data, strLen));
             else
                 return false;
-            LOGV("\t\t%d %.*s", strLen, strLen, data);
+            ALOGV("\t\t%d %.*s", strLen, strLen, data);
             data += strLen;
         }
         newItem->setDocumentState(docState);
@@ -668,7 +668,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
     unsigned char c = (unsigned char)data[0];
     if (c > 1)
         return false;
-    LOGV("Target item     %d", c);
+    ALOGV("Target item     %d", c);
     newItem->setIsTargetItem((bool)c);
     data++;
     if (end - data < sizeofUnsigned)
@@ -676,7 +676,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
 
     // Read the child count
     memcpy(&l, data, sizeofUnsigned);
-    LOGV("Child count     %d", l);
+    ALOGV("Child count     %d", l);
     data += sizeofUnsigned;
     *pData = data;
     if (l) {
diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp
index d5f8947..e46b600 100644
--- a/Source/WebKit/android/jni/WebIconDatabase.cpp
+++ b/Source/WebKit/android/jni/WebIconDatabase.cpp
@@ -185,7 +185,7 @@ static void Open(JNIEnv* env, jobject obj, jstring path)
         }
     }
     if (didSetPermissions) {
-        LOGV("Opening WebIconDatabase file '%s'", pathStr.latin1().data());
+        ALOGV("Opening WebIconDatabase file '%s'", pathStr.latin1().data());
         bool res = iconDb.open(pathStr, WebCore::IconDatabase::defaultDatabaseFilename());
         if (!res)
             LOGE("Open failed!");
@@ -200,7 +200,7 @@ static void Close(JNIEnv* env, jobject obj)
 
 static void RemoveAllIcons(JNIEnv* env, jobject obj)
 {
-    LOGV("Removing all icons");
+    ALOGV("Removing all icons");
     WebCore::iconDatabase().removeAllIcons();
 }
 
@@ -212,7 +212,7 @@ static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url)
     // FIXME: This method should not be used from outside WebCore and will be removed.
     // http://trac.webkit.org/changeset/81484
     WebCore::Image* icon = WebCore::iconDatabase().synchronousIconForPageURL(urlStr, WebCore::IntSize(16, 16));
-    LOGV("Retrieving icon for '%s' %p", urlStr.latin1().data(), icon);
+    ALOGV("Retrieving icon for '%s' %p", urlStr.latin1().data(), icon);
     return webcoreImageToJavaBitmap(env, icon);
 }
 
@@ -221,7 +221,7 @@ static void RetainIconForPageUrl(JNIEnv* env, jobject obj, jstring url)
     LOG_ASSERT(url, "No url given to retainIconForPageUrl");
     WTF::String urlStr = jstringToWtfString(env, url);
 
-    LOGV("Retaining icon for '%s'", urlStr.latin1().data());
+    ALOGV("Retaining icon for '%s'", urlStr.latin1().data());
     WebCore::iconDatabase().retainIconForPageURL(urlStr);
 }
 
@@ -230,7 +230,7 @@ static void ReleaseIconForPageUrl(JNIEnv* env, jobject obj, jstring url)
     LOG_ASSERT(url, "No url given to releaseIconForPageUrl");
     WTF::String urlStr = jstringToWtfString(env, url);
 
-    LOGV("Releasing icon for '%s'", urlStr.latin1().data());
+    ALOGV("Releasing icon for '%s'", urlStr.latin1().data());
     WebCore::iconDatabase().releaseIconForPageURL(urlStr);
 }
 
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index d7a61aa..f3eac89 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1140,7 +1140,7 @@ void WebViewCore::didFirstLayout()
     const WebCore::KURL& url = m_mainFrame->document()->url();
     if (url.isEmpty())
         return;
-    LOGV("::WebCore:: didFirstLayout %s", url.string().ascii().data());
+    ALOGV("::WebCore:: didFirstLayout %s", url.string().ascii().data());
 
     WebCore::FrameLoadType loadType = m_mainFrame->loader()->loadType();
 
@@ -2506,7 +2506,7 @@ String WebViewCore::modifySelectionTextNavigationAxis(DOMSelection* selection, i
     IntRect bounds = range->boundingBox();
     selectAt(bounds.center().x(), bounds.center().y());
     markup = formatMarkup(selection);
-    LOGV("Selection markup: %s", markup.utf8().data());
+    ALOGV("Selection markup: %s", markup.utf8().data());
 
     return markup;
 }
@@ -2765,7 +2765,7 @@ String WebViewCore::modifySelectionDomNavigationAxis(DOMSelection* selection, in
         m_currentNodeDomNavigationAxis = currentNode;
         scrollNodeIntoView(m_mainFrame, currentNode);
         String selectionString = createMarkup(currentNode);
-        LOGV("Selection markup: %s", selectionString.utf8().data());
+        ALOGV("Selection markup: %s", selectionString.utf8().data());
         return selectionString;
     }
     return String();
@@ -4008,7 +4008,7 @@ static void SetSize(JNIEnv *env, jobject obj, jint width, jint height,
     TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
 #endif
     WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj);
-    LOGV("webviewcore::nativeSetSize(%u %u)\n viewImpl: %p", (unsigned)width, (unsigned)height, viewImpl);
+    ALOGV("webviewcore::nativeSetSize(%u %u)\n viewImpl: %p", (unsigned)width, (unsigned)height, viewImpl);
     LOG_ASSERT(viewImpl, "viewImpl not set in nativeSetSize");
     viewImpl->setSizeScreenWidthAndScale(width, height, textWrapWidth, scale,
             screenWidth, screenHeight, anchorX, anchorY, ignoreHeight);
@@ -4134,7 +4134,7 @@ static void SetFocusControllerActive(JNIEnv *env, jobject obj, jboolean active)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
 #endif
-    LOGV("webviewcore::nativeSetFocusControllerActive()\n");
+    ALOGV("webviewcore::nativeSetFocusControllerActive()\n");
     WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj);
     LOG_ASSERT(viewImpl, "viewImpl not set in nativeSetFocusControllerActive");
     viewImpl->setFocusControllerActive(active);
@@ -4145,7 +4145,7 @@ static void SaveDocumentState(JNIEnv *env, jobject obj, jint frame)
 #ifdef ANDROID_INSTRUMENT
     TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
 #endif
-    LOGV("webviewcore::nativeSaveDocumentState()\n");
+    ALOGV("webviewcore::nativeSaveDocumentState()\n");
     WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj);
     LOG_ASSERT(viewImpl, "viewImpl not set in nativeSaveDocumentState");
     viewImpl->saveDocumentState((WebCore::Frame*) frame);
diff --git a/Source/WebKit/android/wds/client/AdbConnection.cpp b/Source/WebKit/android/wds/client/AdbConnection.cpp
index 465f9c3..617ed72 100644
--- a/Source/WebKit/android/wds/client/AdbConnection.cpp
+++ b/Source/WebKit/android/wds/client/AdbConnection.cpp
@@ -89,7 +89,7 @@ bool AdbConnection::sendRequest(const char* fmt, ...) const {
     int res = vsnprintf(buf, MAX_COMMAND_LENGTH, fmt, args);
     va_end(args);
 
-    LOGV("Sending command: %04X%.*s", res, res, buf);
+    ALOGV("Sending command: %04X%.*s", res, res, buf);
 
     // Construct the payload length
     char payloadLen[PAYLOAD_LENGTH + 1];
@@ -156,7 +156,7 @@ bool AdbConnection::checkOkayResponse() const {
 
     // Check for a response other than OKAY/FAIL
     if ((res == ADB_RESPONSE_LENGTH) && (strncmp(buf, "OKAY", res) == 0)) {
-        LOGV("Command OKAY");
+        ALOGV("Command OKAY");
         return true;
     } else if (strncmp(buf, "FAIL", ADB_RESPONSE_LENGTH) == 0) {
         // Something happened, print out the reason for failure
@@ -224,7 +224,7 @@ const DeviceList& AdbConnection::getDeviceList() {
         static const char emulator[] = "emulator-";
         if (strncmp(serial, emulator, sizeof(emulator) - 1) == 0)
             t = Device::EMULATOR;
-        LOGV("Adding device %s (%s)", serial, state);
+        ALOGV("Adding device %s (%s)", serial, state);
         m_devices.add(new Device(serial, t, this));
 
         // Reset for the next line
diff --git a/Source/WebKit/android/wds/client/main.cpp b/Source/WebKit/android/wds/client/main.cpp
index 1c7d856..7e96f30 100644
--- a/Source/WebKit/android/wds/client/main.cpp
+++ b/Source/WebKit/android/wds/client/main.cpp
@@ -141,7 +141,7 @@ int main(int argc, char** argv) {
         return 1;
     }
 
-    LOGV("Connecting to localhost port " PORT_STR);
+    ALOGV("Connecting to localhost port " PORT_STR);
 
     const char* command = argv[optind];
     int commandLen = strlen(command);