Fix some missed class renames

Change-Id: I53e36adb49b7ca4084a8c805db3099e1a51372f0
diff --git a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
index e390816..4f89e02 100644
--- a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
+++ b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
@@ -41,7 +41,7 @@
 @SmallTest
 public class EmailSyncAdapterTests extends SyncAdapterTestCase<EmailSyncAdapter> {
 
-    private static final String WHERE_ACCOUNT_KEY = Message.ACCOUNT_KEY + "=?";
+    private static final String WHERE_ACCOUNT_KEY = MessageColumns.ACCOUNT_KEY + "=?";
     private static final String[] ACCOUNT_ARGUMENT = new String[1];
 
     // A server id that is guaranteed to be test-related
@@ -278,7 +278,7 @@
         mSyncAdapter.mDeletedIdList.add(id);
         id = messageIds.get(2);
         ContentValues cv = new ContentValues();
-        cv.put(Message.FLAG_READ, 0);
+        cv.put(MessageColumns.FLAG_READ, 0);
         mResolver.update(ContentUris.withAppendedId(Message.SYNCED_CONTENT_URI,
                 id), cv, null, null);
         mSyncAdapter.mUpdatedIdList.add(id);