[Settings Refactor] Move Developer settings

Move Developer Settings alongside other tracing code.

Bug: 1047357
Change-Id: Iae70854b966607321a661d58e7680cb154c99178
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036516
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738729}

chrome/android/chrome_java_sources.gni

@@ -1399,9 +1399,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerCardEditor.java",
   "java/src/org/chromium/chrome/browser/settings/autofill/AutofillServerProfileFragment.java",
   "java/src/org/chromium/chrome/browser/settings/autofill/CreditCardNumberFormattingTextWatcher.java",
-  "java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java",
-  "java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java",
   "java/src/org/chromium/chrome/browser/settings/download/DownloadDirectoryAdapter.java",
   "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreference.java",
   "java/src/org/chromium/chrome/browser/settings/download/DownloadLocationPreferenceAdapter.java",
@@ -1748,6 +1745,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tracing/TracingController.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingNotificationManager.java",
   "java/src/org/chromium/chrome/browser/tracing/TracingNotificationService.java",
+  "java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java",
+  "java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java",
+  "java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java",
   "java/src/org/chromium/chrome/browser/translate/TranslateBridge.java",
   "java/src/org/chromium/chrome/browser/translate/TranslateUtils.java",
   "java/src/org/chromium/chrome/browser/ui/BottomContainer.java",

chrome/android/chrome_test_java_sources.gni

@@ -414,7 +414,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/settings/accessibility/AccessibilitySettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillProfilesFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/autofill/AutofillTestRule.java",
-  "javatests/src/org/chromium/chrome/browser/settings/developer/TracingSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/homepage/HomepageSettingsFragmentTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/notifications/NotificationsSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/settings/password/PasswordSettingsTest.java",
@@ -504,6 +503,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/toolbar/top/BrandColorTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/tracing/settings/TracingSettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/translate/TranslateCompactInfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/translate/TranslateOptionsTest.java",
   "javatests/src/org/chromium/chrome/browser/undo_tab_close_snackbar/UndoBarControllerTest.java",

chrome/android/java/res/xml/developer_preferences.xml

@@ -7,7 +7,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orderingFromXml="true">
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.developer.TracingSettings"
+        android:fragment="org.chromium.chrome.browser.tracing.settings.TracingSettings"
         android:key="tracing"
         android:title="Tracing" />
     <org.chromium.chrome.browser.settings.TextMessagePreference

chrome/android/java/res/xml/main_preferences.xml

@@ -96,7 +96,7 @@
         android:order="17"
         android:title="@string/menu_downloads"/>
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.developer.DeveloperSettings"
+        android:fragment="org.chromium.chrome.browser.tracing.settings.DeveloperSettings"
         android:key="developer"
         android:order="18"
         android:title="Developer options"/>

chrome/android/java/res/xml/tracing_preferences.xml

@@ -7,11 +7,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orderingFromXml="true">
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.developer.TracingCategoriesSettings"
+        android:fragment="org.chromium.chrome.browser.tracing.settings.TracingCategoriesSettings"
         android:key="default_categories"
         android:title="Default categories"/><!-- developer strings are not translated -->
     <Preference
-        android:fragment="org.chromium.chrome.browser.settings.developer.TracingCategoriesSettings"
+        android:fragment="org.chromium.chrome.browser.tracing.settings.TracingCategoriesSettings"
         android:key="non_default_categories"
         android:title="Disabled-by-default categories"/>
     <ListPreference

chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java

@@ -27,12 +27,12 @@ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
 import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
 import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-import org.chromium.chrome.browser.settings.developer.DeveloperSettings;
 import org.chromium.chrome.browser.settings.sync.SignInPreference;
 import org.chromium.chrome.browser.settings.sync.SyncSettingsUtils;
 import org.chromium.chrome.browser.signin.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
 import org.chromium.components.search_engines.TemplateUrl;
 import org.chromium.components.search_engines.TemplateUrlService;
 

chrome/android/java/src/org/chromium/chrome/browser/settings/about/AboutChromeSettings.java

@@ -15,7 +15,7 @@ import android.text.format.DateUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.settings.SettingsUtils;
-import org.chromium.chrome.browser.settings.developer.DeveloperSettings;
+import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
 import org.chromium.ui.widget.Toast;
 
 import java.util.Calendar;

chrome/android/java/src/org/chromium/chrome/browser/settings/developer/OWNERS

-eseckler@chromium.org
-skyostil@chromium.org
-
-per-file Tracing*=file://base/trace_event/OWNERS

chrome/android/java/src/org/chromium/chrome/browser/tracing/TracingController.java

@@ -20,7 +20,7 @@ import org.chromium.base.ObserverList;
 import org.chromium.base.task.AsyncTask;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
-import org.chromium.chrome.browser.settings.developer.TracingSettings;
+import org.chromium.chrome.browser.tracing.settings.TracingSettings;
 import org.chromium.content_public.browser.TracingControllerAndroid;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 import org.chromium.ui.widget.Toast;

chrome/android/java/src/org/chromium/chrome/browser/settings/developer/DeveloperSettings.java → chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.developer;
+package org.chromium.chrome.browser.tracing.settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;

chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingCategoriesSettings.java → chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingCategoriesSettings.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.developer;
+package org.chromium.chrome.browser.tracing.settings;
 
 import android.content.Context;
 import android.os.Bundle;

chrome/android/java/src/org/chromium/chrome/browser/settings/developer/TracingSettings.java → chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/TracingSettings.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.developer;
+package org.chromium.chrome.browser.tracing.settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.ListPreference;

chrome/android/javatests/src/org/chromium/chrome/browser/settings/developer/TracingSettingsTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/tracing/settings/TracingSettingsTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.settings.developer;
+package org.chromium.chrome.browser.tracing.settings;
 
 import static android.app.Notification.FLAG_ONGOING_EVENT;