6 files changed, 8 insertions, 8 deletions
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp
index 780ea53..8629731 100644
--- a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp
@@ -215,9 +215,9 @@ void EditorClientAndroid::redo() {}
 
 // functions new to Jun-07 tip of tree merge:
 void EditorClientAndroid::showSpellingUI(bool) {}
-void EditorClientAndroid::getGuessesForWord(String const&, Vector<String>&) {}
+void EditorClientAndroid::getGuessesForWord(String const&, WTF::Vector<String>&) {}
 bool EditorClientAndroid::spellingUIIsShowing() { return false; }
-void EditorClientAndroid::checkGrammarOfString(unsigned short const*, int, Vector<GrammarDetail>&, int*, int*) {}
+void EditorClientAndroid::checkGrammarOfString(unsigned short const*, int, WTF::Vector<GrammarDetail>&, int*, int*) {}
 void EditorClientAndroid::checkSpellingOfString(unsigned short const*, int, int*, int*) {}
 void EditorClientAndroid::textFieldDidEndEditing(Element*) {}
 void EditorClientAndroid::textDidChangeInTextArea(Element*) {}
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.h b/WebKit/android/WebCoreSupport/EditorClientAndroid.h
index 42e9c43..763b097 100644
--- a/WebKit/android/WebCoreSupport/EditorClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.h
@@ -94,12 +94,12 @@ public:
     virtual void ignoreWordInSpellDocument(const String&);
     virtual void learnWord(const String&);
     virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength);
-    virtual void checkGrammarOfString(const UChar*, int length, Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
+    virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
     virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail& detail);
     virtual void updateSpellingUIWithMisspelledWord(const String&);
     virtual void showSpellingUI(bool show);
     virtual bool spellingUIIsShowing();
-    virtual void getGuessesForWord(const String&, Vector<String>& guesses);
+    virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses);
     virtual void setInputMethodState(bool);
 
     // Android specific:
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index 143537f..2816c78 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -173,7 +173,7 @@ namespace android {
             const String&, bool);
         virtual void redirectDataToPlugin(Widget* pluginWidget);
         
-        virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues);
+        virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const WTF::Vector<String>& paramNames, const WTF::Vector<String>& paramValues);
 
         virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType);
         virtual String overrideMediaType() const;
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index 15b1ef1..1b01f5e 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -314,7 +314,7 @@ public:
             if (pluginsPath.length()) {
                 s->setPluginsPath(pluginsPath);
                 // Set the plugin directories to this single entry.
-                Vector< ::WebCore::String > paths(1);
+                WTF::Vector< ::WebCore::String > paths(1);
                 paths[0] = pluginsPath;
                 pluginDatabase->setPluginDirectories(paths);
                 // Set the home directory for plugin temporary files
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 55e4359..11af525 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1659,7 +1659,7 @@ public:
         // If count is 1 or 0, use replyInt.
         SkASSERT(count > 1);
 
-        const Vector<HTMLElement*>& items = m_select->listItems();
+        const WTF::Vector<HTMLElement*>& items = m_select->listItems();
         int totalItems = static_cast<int>(items.size());
         // Keep track of the position of the value we are comparing against.
         int arrayIndex = 0;
diff --git a/WebKit/android/wds/DebugServer.h b/WebKit/android/wds/DebugServer.h
index a0a2aa8..3ec158b 100644
--- a/WebKit/android/wds/DebugServer.h
+++ b/WebKit/android/wds/DebugServer.h
@@ -63,7 +63,7 @@ public:
     }
 private:
     DebugServer();
-    Vector<Frame*> m_frames;
+    WTF::Vector<Frame*> m_frames;
     ThreadIdentifier m_threadId;
     friend DebugServer* server();
 };