Bug 1058101 - Flatten dom/mobilemessage/src/ into parent directory. r=mccr8
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 27 Aug 2014 10:13:36 -0700
changeset 202746 dbc8333984a32a6037b149cfafd038729c2bdf90
parent 202745 cf7e72e6455ccc1d414e13b74b5e9d8a1ce7d46d
child 202747 9bfbf136a398b5d33635a62e0d173dce6e887546
push id27407
push userphilringnalda@gmail.com
push dateMon, 01 Sep 2014 01:17:59 +0000
treeherdermozilla-central@ef40d40dd8c9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1058101
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1058101 - Flatten dom/mobilemessage/src/ into parent directory. r=mccr8
dom/ipc/moz.build
dom/mobilemessage/Constants.cpp
dom/mobilemessage/Constants.h
dom/mobilemessage/DOMMobileMessageError.cpp
dom/mobilemessage/DOMMobileMessageError.h
dom/mobilemessage/DeletedMessageInfo.cpp
dom/mobilemessage/DeletedMessageInfo.h
dom/mobilemessage/MmsMessage.cpp
dom/mobilemessage/MmsMessage.h
dom/mobilemessage/MobileMessageCallback.cpp
dom/mobilemessage/MobileMessageCallback.h
dom/mobilemessage/MobileMessageCursorCallback.cpp
dom/mobilemessage/MobileMessageCursorCallback.h
dom/mobilemessage/MobileMessageManager.cpp
dom/mobilemessage/MobileMessageManager.h
dom/mobilemessage/MobileMessageService.cpp
dom/mobilemessage/MobileMessageService.h
dom/mobilemessage/MobileMessageThread.cpp
dom/mobilemessage/MobileMessageThread.h
dom/mobilemessage/SmsMessage.cpp
dom/mobilemessage/SmsMessage.h
dom/mobilemessage/SmsServicesFactory.cpp
dom/mobilemessage/SmsServicesFactory.h
dom/mobilemessage/Types.h
dom/mobilemessage/android/MobileMessageDatabaseService.cpp
dom/mobilemessage/android/MobileMessageDatabaseService.h
dom/mobilemessage/android/SmsService.cpp
dom/mobilemessage/android/SmsService.h
dom/mobilemessage/gonk/MmsPduHelper.jsm
dom/mobilemessage/gonk/MmsService.js
dom/mobilemessage/gonk/MmsService.manifest
dom/mobilemessage/gonk/MobileMessageDB.jsm
dom/mobilemessage/gonk/MobileMessageDatabaseService.js
dom/mobilemessage/gonk/MobileMessageDatabaseService.manifest
dom/mobilemessage/gonk/SmsService.cpp
dom/mobilemessage/gonk/SmsService.h
dom/mobilemessage/gonk/WspPduHelper.jsm
dom/mobilemessage/gonk/mms_consts.js
dom/mobilemessage/gonk/wap_consts.js
dom/mobilemessage/ipc/PMobileMessageCursor.ipdl
dom/mobilemessage/ipc/PSms.ipdl
dom/mobilemessage/ipc/PSmsRequest.ipdl
dom/mobilemessage/ipc/SmsChild.cpp
dom/mobilemessage/ipc/SmsChild.h
dom/mobilemessage/ipc/SmsIPCService.cpp
dom/mobilemessage/ipc/SmsIPCService.h
dom/mobilemessage/ipc/SmsParent.cpp
dom/mobilemessage/ipc/SmsParent.h
dom/mobilemessage/ipc/SmsTypes.ipdlh
dom/mobilemessage/moz.build
dom/mobilemessage/src/Constants.cpp
dom/mobilemessage/src/Constants.h
dom/mobilemessage/src/DOMMobileMessageError.cpp
dom/mobilemessage/src/DOMMobileMessageError.h
dom/mobilemessage/src/DeletedMessageInfo.cpp
dom/mobilemessage/src/DeletedMessageInfo.h
dom/mobilemessage/src/MmsMessage.cpp
dom/mobilemessage/src/MmsMessage.h
dom/mobilemessage/src/MobileMessageCallback.cpp
dom/mobilemessage/src/MobileMessageCallback.h
dom/mobilemessage/src/MobileMessageCursorCallback.cpp
dom/mobilemessage/src/MobileMessageCursorCallback.h
dom/mobilemessage/src/MobileMessageManager.cpp
dom/mobilemessage/src/MobileMessageManager.h
dom/mobilemessage/src/MobileMessageService.cpp
dom/mobilemessage/src/MobileMessageService.h
dom/mobilemessage/src/MobileMessageThread.cpp
dom/mobilemessage/src/MobileMessageThread.h
dom/mobilemessage/src/SmsMessage.cpp
dom/mobilemessage/src/SmsMessage.h
dom/mobilemessage/src/SmsServicesFactory.cpp
dom/mobilemessage/src/SmsServicesFactory.h
dom/mobilemessage/src/Types.h
dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp
dom/mobilemessage/src/android/MobileMessageDatabaseService.h
dom/mobilemessage/src/android/SmsService.cpp
dom/mobilemessage/src/android/SmsService.h
dom/mobilemessage/src/gonk/MmsPduHelper.jsm
dom/mobilemessage/src/gonk/MmsService.js
dom/mobilemessage/src/gonk/MmsService.manifest
dom/mobilemessage/src/gonk/MobileMessageDB.jsm
dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js
dom/mobilemessage/src/gonk/MobileMessageDatabaseService.manifest
dom/mobilemessage/src/gonk/SmsService.cpp
dom/mobilemessage/src/gonk/SmsService.h
dom/mobilemessage/src/gonk/WspPduHelper.jsm
dom/mobilemessage/src/gonk/mms_consts.js
dom/mobilemessage/src/gonk/wap_consts.js
dom/mobilemessage/src/ipc/PMobileMessageCursor.ipdl
dom/mobilemessage/src/ipc/PSms.ipdl
dom/mobilemessage/src/ipc/PSmsRequest.ipdl
dom/mobilemessage/src/ipc/SmsChild.cpp
dom/mobilemessage/src/ipc/SmsChild.h
dom/mobilemessage/src/ipc/SmsIPCService.cpp
dom/mobilemessage/src/ipc/SmsIPCService.h
dom/mobilemessage/src/ipc/SmsParent.cpp
dom/mobilemessage/src/ipc/SmsParent.h
dom/mobilemessage/src/ipc/SmsTypes.ipdlh
dom/mobilemessage/src/moz.build
embedding/android/GeckoSmsManager.java
mobile/android/base/GeckoSmsManager.java
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -109,17 +109,17 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/bluetooth',
     '/dom/bluetooth/ipc',
     '/dom/devicestorage',
     '/dom/filesystem',
     '/dom/fmradio/ipc',
     '/dom/indexedDB',
     '/dom/indexedDB/ipc',
-    '/dom/mobilemessage/src/ipc',
+    '/dom/mobilemessage/ipc',
     '/extensions/cookie',
     '/hal/sandbox',
     '/js/ipc',
     '/layout/base',
     '/netwerk/base/src',
     '/toolkit/xre',
     '/uriloader/exthandler',
     '/widget/xpwidgets',
rename from dom/mobilemessage/src/Constants.cpp
rename to dom/mobilemessage/Constants.cpp
rename from dom/mobilemessage/src/Constants.h
rename to dom/mobilemessage/Constants.h
rename from dom/mobilemessage/src/DOMMobileMessageError.cpp
rename to dom/mobilemessage/DOMMobileMessageError.cpp
rename from dom/mobilemessage/src/DOMMobileMessageError.h
rename to dom/mobilemessage/DOMMobileMessageError.h
rename from dom/mobilemessage/src/DeletedMessageInfo.cpp
rename to dom/mobilemessage/DeletedMessageInfo.cpp
rename from dom/mobilemessage/src/DeletedMessageInfo.h
rename to dom/mobilemessage/DeletedMessageInfo.h
rename from dom/mobilemessage/src/MmsMessage.cpp
rename to dom/mobilemessage/MmsMessage.cpp
rename from dom/mobilemessage/src/MmsMessage.h
rename to dom/mobilemessage/MmsMessage.h
rename from dom/mobilemessage/src/MobileMessageCallback.cpp
rename to dom/mobilemessage/MobileMessageCallback.cpp
rename from dom/mobilemessage/src/MobileMessageCallback.h
rename to dom/mobilemessage/MobileMessageCallback.h
rename from dom/mobilemessage/src/MobileMessageCursorCallback.cpp
rename to dom/mobilemessage/MobileMessageCursorCallback.cpp
rename from dom/mobilemessage/src/MobileMessageCursorCallback.h
rename to dom/mobilemessage/MobileMessageCursorCallback.h
rename from dom/mobilemessage/src/MobileMessageManager.cpp
rename to dom/mobilemessage/MobileMessageManager.cpp
rename from dom/mobilemessage/src/MobileMessageManager.h
rename to dom/mobilemessage/MobileMessageManager.h
rename from dom/mobilemessage/src/MobileMessageService.cpp
rename to dom/mobilemessage/MobileMessageService.cpp
rename from dom/mobilemessage/src/MobileMessageService.h
rename to dom/mobilemessage/MobileMessageService.h
rename from dom/mobilemessage/src/MobileMessageThread.cpp
rename to dom/mobilemessage/MobileMessageThread.cpp
rename from dom/mobilemessage/src/MobileMessageThread.h
rename to dom/mobilemessage/MobileMessageThread.h
rename from dom/mobilemessage/src/SmsMessage.cpp
rename to dom/mobilemessage/SmsMessage.cpp
rename from dom/mobilemessage/src/SmsMessage.h
rename to dom/mobilemessage/SmsMessage.h
rename from dom/mobilemessage/src/SmsServicesFactory.cpp
rename to dom/mobilemessage/SmsServicesFactory.cpp
rename from dom/mobilemessage/src/SmsServicesFactory.h
rename to dom/mobilemessage/SmsServicesFactory.h
rename from dom/mobilemessage/src/Types.h
rename to dom/mobilemessage/Types.h
rename from dom/mobilemessage/src/android/MobileMessageDatabaseService.cpp
rename to dom/mobilemessage/android/MobileMessageDatabaseService.cpp
rename from dom/mobilemessage/src/android/MobileMessageDatabaseService.h
rename to dom/mobilemessage/android/MobileMessageDatabaseService.h
rename from dom/mobilemessage/src/android/SmsService.cpp
rename to dom/mobilemessage/android/SmsService.cpp
rename from dom/mobilemessage/src/android/SmsService.h
rename to dom/mobilemessage/android/SmsService.h
rename from dom/mobilemessage/src/gonk/MmsPduHelper.jsm
rename to dom/mobilemessage/gonk/MmsPduHelper.jsm
rename from dom/mobilemessage/src/gonk/MmsService.js
rename to dom/mobilemessage/gonk/MmsService.js
rename from dom/mobilemessage/src/gonk/MmsService.manifest
rename to dom/mobilemessage/gonk/MmsService.manifest
rename from dom/mobilemessage/src/gonk/MobileMessageDB.jsm
rename to dom/mobilemessage/gonk/MobileMessageDB.jsm
rename from dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js
rename to dom/mobilemessage/gonk/MobileMessageDatabaseService.js
rename from dom/mobilemessage/src/gonk/MobileMessageDatabaseService.manifest
rename to dom/mobilemessage/gonk/MobileMessageDatabaseService.manifest
rename from dom/mobilemessage/src/gonk/SmsService.cpp
rename to dom/mobilemessage/gonk/SmsService.cpp
rename from dom/mobilemessage/src/gonk/SmsService.h
rename to dom/mobilemessage/gonk/SmsService.h
rename from dom/mobilemessage/src/gonk/WspPduHelper.jsm
rename to dom/mobilemessage/gonk/WspPduHelper.jsm
rename from dom/mobilemessage/src/gonk/mms_consts.js
rename to dom/mobilemessage/gonk/mms_consts.js
rename from dom/mobilemessage/src/gonk/wap_consts.js
rename to dom/mobilemessage/gonk/wap_consts.js
rename from dom/mobilemessage/src/ipc/PMobileMessageCursor.ipdl
rename to dom/mobilemessage/ipc/PMobileMessageCursor.ipdl
rename from dom/mobilemessage/src/ipc/PSms.ipdl
rename to dom/mobilemessage/ipc/PSms.ipdl
rename from dom/mobilemessage/src/ipc/PSmsRequest.ipdl
rename to dom/mobilemessage/ipc/PSmsRequest.ipdl
rename from dom/mobilemessage/src/ipc/SmsChild.cpp
rename to dom/mobilemessage/ipc/SmsChild.cpp
rename from dom/mobilemessage/src/ipc/SmsChild.h
rename to dom/mobilemessage/ipc/SmsChild.h
rename from dom/mobilemessage/src/ipc/SmsIPCService.cpp
rename to dom/mobilemessage/ipc/SmsIPCService.cpp
rename from dom/mobilemessage/src/ipc/SmsIPCService.h
rename to dom/mobilemessage/ipc/SmsIPCService.h
rename from dom/mobilemessage/src/ipc/SmsParent.cpp
rename to dom/mobilemessage/ipc/SmsParent.cpp
rename from dom/mobilemessage/src/ipc/SmsParent.h
rename to dom/mobilemessage/ipc/SmsParent.h
rename from dom/mobilemessage/src/ipc/SmsTypes.ipdlh
rename to dom/mobilemessage/ipc/SmsTypes.ipdlh
--- a/dom/mobilemessage/moz.build
+++ b/dom/mobilemessage/moz.build
@@ -1,10 +1,85 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['interfaces', 'src']
+DIRS += ['interfaces']
 
 MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
+
+EXPORTS.mozilla.dom.mobilemessage += [
+    'Constants.h',            # Required by almost all cpp files
+    'ipc/SmsChild.h',
+    'ipc/SmsParent.h',
+    'MobileMessageService.h', # Required by nsLayoutModule.cpp
+    'SmsServicesFactory.h',   # Required by nsLayoutModule.cpp
+    'Types.h',                # Required by IPDL SmsTypes.h
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    SOURCES += [
+        'android/MobileMessageDatabaseService.cpp',
+        'android/SmsService.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
+    EXTRA_JS_MODULES += [
+        'gonk/mms_consts.js',
+        'gonk/MmsPduHelper.jsm',
+        'gonk/MobileMessageDB.jsm',
+        'gonk/wap_consts.js',
+        'gonk/WspPduHelper.jsm',
+    ]
+    EXTRA_COMPONENTS += [
+        'gonk/MmsService.js',
+        'gonk/MmsService.manifest',
+        'gonk/MobileMessageDatabaseService.js',
+        'gonk/MobileMessageDatabaseService.manifest',
+    ]
+    SOURCES += [
+        'gonk/SmsService.cpp',
+    ]
+
+EXPORTS.mozilla.dom += [
+    'DOMMobileMessageError.h',
+    'MmsMessage.h',
+    'MobileMessageManager.h',
+    'SmsMessage.h',
+]
+
+UNIFIED_SOURCES += [
+    'Constants.cpp',
+    'DeletedMessageInfo.cpp',
+    'DOMMobileMessageError.cpp',
+    'ipc/SmsChild.cpp',
+    'ipc/SmsIPCService.cpp',
+    'ipc/SmsParent.cpp',
+    'MmsMessage.cpp',
+    'MobileMessageCallback.cpp',
+    'MobileMessageCursorCallback.cpp',
+    'MobileMessageManager.cpp',
+    'MobileMessageService.cpp',
+    'MobileMessageThread.cpp',
+    'SmsMessage.cpp',
+    'SmsServicesFactory.cpp',
+]
+
+IPDL_SOURCES += [
+    'ipc/PMobileMessageCursor.ipdl',
+    'ipc/PSms.ipdl',
+    'ipc/PSmsRequest.ipdl',
+    'ipc/SmsTypes.ipdlh',
+]
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/dom/mobilemessage/src/moz.build
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS.mozilla.dom.mobilemessage += [
-    'Constants.h',            # Required by almost all cpp files
-    'ipc/SmsChild.h',
-    'ipc/SmsParent.h',
-    'MobileMessageService.h', # Required by nsLayoutModule.cpp
-    'SmsServicesFactory.h',   # Required by nsLayoutModule.cpp
-    'Types.h',                # Required by IPDL SmsTypes.h
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    SOURCES += [
-        'android/MobileMessageDatabaseService.cpp',
-        'android/SmsService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
-    EXTRA_JS_MODULES += [
-        'gonk/mms_consts.js',
-        'gonk/MmsPduHelper.jsm',
-        'gonk/MobileMessageDB.jsm',
-        'gonk/wap_consts.js',
-        'gonk/WspPduHelper.jsm',
-    ]
-    EXTRA_COMPONENTS += [
-        'gonk/MmsService.js',
-        'gonk/MmsService.manifest',
-        'gonk/MobileMessageDatabaseService.js',
-        'gonk/MobileMessageDatabaseService.manifest',
-    ]
-    SOURCES += [
-        'gonk/SmsService.cpp',
-    ]
-
-EXPORTS.mozilla.dom += [
-    'DOMMobileMessageError.h',
-    'MmsMessage.h',
-    'MobileMessageManager.h',
-    'SmsMessage.h',
-]
-
-UNIFIED_SOURCES += [
-    'Constants.cpp',
-    'DeletedMessageInfo.cpp',
-    'DOMMobileMessageError.cpp',
-    'ipc/SmsChild.cpp',
-    'ipc/SmsIPCService.cpp',
-    'ipc/SmsParent.cpp',
-    'MmsMessage.cpp',
-    'MobileMessageCallback.cpp',
-    'MobileMessageCursorCallback.cpp',
-    'MobileMessageManager.cpp',
-    'MobileMessageService.cpp',
-    'MobileMessageThread.cpp',
-    'SmsMessage.cpp',
-    'SmsServicesFactory.cpp',
-]
-
-IPDL_SOURCES += [
-    'ipc/PMobileMessageCursor.ipdl',
-    'ipc/PSms.ipdl',
-    'ipc/PSmsRequest.ipdl',
-    'ipc/SmsTypes.ipdlh',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'
--- a/embedding/android/GeckoSmsManager.java
+++ b/embedding/android/GeckoSmsManager.java
@@ -319,29 +319,29 @@ public class GeckoSmsManager
   private final static Uri kSmsContentUri     = Uri.parse("content://sms");
   private final static Uri kSmsSentContentUri = Uri.parse("content://sms/sent");
 
   private final static int kSmsTypeInbox      = 1;
   private final static int kSmsTypeSentbox    = 2;
 
   /*
    * Keep the following state codes in syng with |DeliveryState| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    */
   private final static int kDeliveryStateSent          = 0;
   private final static int kDeliveryStateReceived      = 1;
   private final static int kDeliveryStateSending       = 2;
   private final static int kDeliveryStateError         = 3;
   private final static int kDeliveryStateUnknown       = 4;
   private final static int kDeliveryStateNotDownloaded = 5;
   private final static int kDeliveryStateEndGuard      = 6;
 
   /*
    * Keep the following status codes in sync with |DeliveryStatus| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    */
   private final static int kDeliveryStatusNotApplicable = 0;
   private final static int kDeliveryStatusSuccess       = 1;
   private final static int kDeliveryStatusPending       = 2;
   private final static int kDeliveryStatusError         = 3;
 
   /*
    * android.provider.Telephony.Sms.STATUS_*. Duplicated because they're not
@@ -349,17 +349,17 @@ public class GeckoSmsManager
    */
   private final static int kInternalDeliveryStatusNone     = -1;
   private final static int kInternalDeliveryStatusComplete = 0;
   private final static int kInternalDeliveryStatusPending  = 32;
   private final static int kInternalDeliveryStatusFailed   = 64;
 
   /*
    * Keep the following values in sync with |MessageClass| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    */
   private final static int kMessageClassNormal  = 0;
   private final static int kMessageClassClass0  = 1;
   private final static int kMessageClassClass1  = 2;
   private final static int kMessageClassClass2  = 3;
   private final static int kMessageClassClass3  = 4;
 
   private final static String[] kRequiredMessageRows = new String[] { "_id", "address", "body", "date", "type", "status" };
--- a/mobile/android/base/GeckoSmsManager.java
+++ b/mobile/android/base/GeckoSmsManager.java
@@ -286,17 +286,17 @@ public class GeckoSmsManager
   implements ISmsManager
 {
   public final static String ACTION_SMS_RECEIVED  = "android.provider.Telephony.SMS_RECEIVED";
   public final static String ACTION_SMS_SENT      = "org.mozilla.gecko.SMS_SENT";
   public final static String ACTION_SMS_DELIVERED = "org.mozilla.gecko.SMS_DELIVERED";
 
   /*
    * Make sure that the following error codes are in sync with |ErrorType| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    * The error code are owned by the DOM.
    */
   public final static int kNoError               = 0;
   public final static int kNoSignalError         = 1;
   public final static int kNotFoundError         = 2;
   public final static int kUnknownError          = 3;
   public final static int kInternalError         = 4;
   public final static int kNoSimCardError        = 5;
@@ -312,29 +312,29 @@ public class GeckoSmsManager
   private final static Uri kSmsContentUri     = Uri.parse("content://sms");
   private final static Uri kSmsSentContentUri = Uri.parse("content://sms/sent");
 
   private final static int kSmsTypeInbox      = 1;
   private final static int kSmsTypeSentbox    = 2;
 
   /*
    * Keep the following state codes in syng with |DeliveryState| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    */
   private final static int kDeliveryStateSent          = 0;
   private final static int kDeliveryStateReceived      = 1;
   private final static int kDeliveryStateSending       = 2;
   private final static int kDeliveryStateError         = 3;
   private final static int kDeliveryStateUnknown       = 4;
   private final static int kDeliveryStateNotDownloaded = 5;
   private final static int kDeliveryStateEndGuard      = 6;
 
   /*
    * Keep the following status codes in sync with |DeliveryStatus| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    */
   private final static int kDeliveryStatusNotApplicable = 0;
   private final static int kDeliveryStatusSuccess       = 1;
   private final static int kDeliveryStatusPending       = 2;
   private final static int kDeliveryStatusError         = 3;
 
   /*
    * android.provider.Telephony.Sms.STATUS_*. Duplicated because they're not
@@ -342,17 +342,17 @@ public class GeckoSmsManager
    */
   private final static int kInternalDeliveryStatusNone     = -1;
   private final static int kInternalDeliveryStatusComplete = 0;
   private final static int kInternalDeliveryStatusPending  = 32;
   private final static int kInternalDeliveryStatusFailed   = 64;
 
   /*
    * Keep the following values in sync with |MessageClass| in:
-   * dom/mobilemessage/src/Types.h
+   * dom/mobilemessage/Types.h
    */
   private final static int kMessageClassNormal  = 0;
   private final static int kMessageClassClass0  = 1;
   private final static int kMessageClassClass1  = 2;
   private final static int kMessageClassClass2  = 3;
   private final static int kMessageClassClass3  = 4;
 
   private final static String[] kRequiredMessageRows = new String[] { "_id", "address", "body", "date", "type", "status" };