Move http_server_properties_manager from chrome/browser/net to net/http.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_device_id_salt.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
-#include "chrome/browser/net/http_server_properties_manager.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/message_center_notification_manager.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
@@ skipping 38 matching lines @@
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/network_time/network_time_tracker.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/rappor/rappor_service.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_prefs.h"
+#include "net/http/http_server_properties_manager.h"
 
 #if defined(ENABLE_AUTOFILL_DIALOG)
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/browser/url_blacklist_manager.h"
 #include "components/policy/core/common/policy_statistics_collector.h"
 #endif
@@ skipping 106 matching lines @@
 // registered. We keep it here for now to clear out those old prefs in
 // MigrateUserPrefs.
 const char kBackupPref[] = "backup";
 
 #if !defined(OS_ANDROID)
 // The sync promo error message preference has been removed; this pref will
 // be cleared from user data.
 const char kSyncPromoErrorMessage[] = "sync_promo.error_message";
 #endif
 
+// Register |prefs| for properties managed by HttpServerPropertiesManager.
+void HttpServerPropertiesManager_RegisterProfilePrefs(

[droger, 2014/07/08 13:06:02]

Shouldn't this stay in the HttpServerPropertiesManager class?

[mef, 2014/07/08 13:32:00]

The problem is that user_prefs::PrefRegistrySyncable is in
//components/pref_registry, and //net cannot depend on it.

[battre, 2014/07/08 14:16:57]

Bernhard, what do you think about this?

My feeling is that ownership and registration of preferences should not be
split. OTOH, //net should not depend on //components/pref_registry.

I can see two approaches.
1) Leave the preference management in //chrome/browser.
2) Provide a wrapper interface in //base/prefs that is implemented by
//components/pref_registry and can be pushed into //net.

I don't like either of the two apporaches. WDYT? Do you have a better idea?

[Bernhard Bauer, 2014/07/08 16:02:46]

We already pass in the pref path for the HttpServerPropertiesManager to use when
creating it (currently in ProfileIOData). How about creating a method somewhere
in chrome/browser/net that will register the pref, and extracting the code that
creates the HttpServerPropertiesManager into another method in that same file in
chrome/browser/net? The idea is that chrome/browser/net (due to being in
chrome/, the top-level component), is the embedder of lower-level components
like net/ and components/pref_registry, so it can inject their dependencies.

[mef, 2014/07/08 16:19:54]

Sounds good. Just to make sure that I understand correctly, you are suggesting
to create a class in c/b/n similar to
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/net...
which will have static methods to instantiate and to register the
HttpServerPropertiesManager. Would something like
HttpServerPropertiesManagerPrefs be a good name for that?

[Bernhard Bauer, 2014/07/08 17:02:45]

Yup, pretty much.

The only thing I'm not sure about is the naming. If it also creates the
HttpServerPropertiesManager, I'd not want to call it ...Prefs; it has a bigger
role, so maybe ...Context, or -- dare I say it -- ...Factory? :) 

Or, another pattern would be to call it ChromeHttpServerPropertiesManager,
signifying that it's about the chrome/ embedding of the component.

[mef, 2014/07/08 17:11:20]

I like ChromeHttpServerPropertiesManager, but I don't think it inherits from
from HttpServerPropertiesManager, so HttpServerPropertiesManagerFactory sounds
more correct.

[mef, 2014/07/08 18:04:32]

Done.

+    user_prefs::PrefRegistrySyncable* prefs) {
+  prefs->RegisterDictionaryPref(
+      prefs::kHttpServerProperties,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+}
+
 }  // namespace
 
 namespace chrome {
 
 void RegisterLocalState(PrefRegistrySimple* registry) {
   // Prefs in Local State.
   registry->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
 
   // Please keep this list alphabetized.
   AppListService::RegisterPrefs(registry);
@@ skipping 111 matching lines @@
 
 // Register prefs applicable to all profiles.
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
   // User prefs. Please keep this list alphabetized.
   autofill::AutofillManager::RegisterProfilePrefs(registry);
   bookmark_utils::RegisterProfilePrefs(registry);
   sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
   ChromeContentBrowserClient::RegisterProfilePrefs(registry);
   ChromeVersionService::RegisterProfilePrefs(registry);
-  chrome_browser_net::HttpServerPropertiesManager::RegisterProfilePrefs(
-      registry);
+  HttpServerPropertiesManager_RegisterProfilePrefs(registry);

[battre, 2014/07/08 14:16:57]

please consider the request to keep this alphabetized.

[Bernhard Bauer, 2014/07/08 16:02:46]

+1

[mef, 2014/07/08 16:19:54]

Will do.

[mef, 2014/07/08 18:04:32]

Done.

   chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
   chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
   chrome_prefs::RegisterProfilePrefs(registry);
   DownloadPrefs::RegisterProfilePrefs(registry);
   easy_unlock::RegisterProfilePrefs(registry);
   gcm::GCMProfileService::RegisterProfilePrefs(registry);
   HostContentSettingsMap::RegisterProfilePrefs(registry);
   IncognitoModePrefs::RegisterProfilePrefs(registry);
   InstantUI::RegisterProfilePrefs(registry);
   NavigationCorrectionTabObserver::RegisterProfilePrefs(registry);
@@ skipping 227 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   MigrateBrowserTabStripPrefs(local_state);
 #endif
 }
 
 }  // namespace chrome