Backed out changeset 09df445cbdd9 (bug 1550075) for f8 linting failure at raptor.py:857:10. CLOSED TREE

testing/profiles/raptor-android/extensions/README.txt

@@ -1,2 +0,0 @@
-Dropping extensions here will get them installed in all test harnesses
-that make use of this profile.

testing/profiles/raptor-android/user.js

@@ -1,5 +0,0 @@
-// Preferences file used by the raptor harness exclusively on android
-/* globals user_pref */
-
-// disk cache smart size is enabled in shipped apps
-user_pref("browser.cache.disk.smart_size.enabled", true);

testing/raptor/raptor/raptor.py

@@ -851,14 +851,6 @@ class RaptorAndroid(Raptor):
         for key, value in commands.items():
             self._set_value_and_check_exitcode(key, value, root=True)
 
-    def build_browser_profile(self):
-        super(RaptorAndroid, self).build_browser_profile()
-
-         # Merge in the android profile
-        path = os.path.join(self.profile_data_dir, 'raptor-android')
-        self.log.info("Merging profile: {}".format(path))
-        self.profile.merge(path)
-
     def clear_app_data(self):
         self.log.info("clearing %s app data" % self.config['binary'])
         self.device.shell("pm clear %s" % self.config['binary'])