redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/test/base/testing_profile.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 243 matching lines @@
   virtual void SetupChromeOSEnterpriseExtensionObserver() {
   }
   virtual void InitChromeOSPreferences() {
   }
   virtual void ChangeAppLocale(const std::string&, AppLocaleChangedVia) {
   }
   virtual void OnLogin() {
   }
 #endif  // defined(OS_CHROMEOS)
 
-  virtual PrefProxyConfigTracker* GetProxyConfigTracker();
+  virtual PrefProxyConfigTrackerType* GetProxyConfigTracker();
 
   // Schedules a task on the history backend and runs a nested loop until the
   // task is processed.  This has the effect of blocking the caller until the
   // history service processes all pending requests.
   void BlockUntilHistoryProcessesPendingRequests();
 
   // Creates and initializes a profile sync service if the tests require one.
   virtual TokenService* GetTokenService();
   virtual ProfileSyncService* GetProfileSyncService();
   virtual ProfileSyncService* GetProfileSyncService(
@@ skipping 100 matching lines @@
   scoped_ptr<ExtensionPrefs> extension_prefs_;
 
   scoped_ptr<ExtensionService> extension_service_;
 
   scoped_ptr<ExtensionPrefValueMap> extension_pref_value_map_;
 
   scoped_refptr<ExtensionSpecialStoragePolicy>
       extension_special_storage_policy_;
 
   // The proxy prefs tracker.
-  scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+  scoped_ptr<PrefProxyConfigTrackerType> pref_proxy_config_tracker_;
 
   // We use a temporary directory to store testing profile data. In a multi-
   // profile environment, this is invalid and the directory is managed by the
   // TestingProfileManager.
   ScopedTempDir temp_dir_;
   // The path to this profile. This will be valid in either of the two above
   // cases.
   FilePath profile_path_;
 
   scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
 
   // We keep a weak pointer to the dependency manager we want to notify on our
   // death. Defaults to the Singleton implementation but overridable for
   // testing.
   ProfileDependencyManager* profile_dependency_manager_;
 
   scoped_refptr<ChromeAppCacheService> appcache_service_;
 
   // The QuotaManager, only available if set explicitly via SetQuotaManager.
   scoped_refptr<quota::QuotaManager> quota_manager_;
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_PROFILE_H_