Skip to content

Commit

Permalink
Remove RemoteAccessClientFirewallTraversal policy and code paths.
Browse files Browse the repository at this point in the history
BUG=96318
TEST=

Review URL: http://codereview.chromium.org/8275012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106521 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
wez@chromium.org committed Oct 20, 2011
1 parent e50540e commit 5bc5c15
Show file tree
Hide file tree
Showing 44 changed files with 5 additions and 735 deletions.
5 changes: 4 additions & 1 deletion chrome/app/policy/policy_templates.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,13 @@
'type': 'main',
'supported_on': ['chrome.*:14-', 'chrome_os:0.14-'],
'features': {'dynamic_refresh': 1},
# Mark this 'removed' when http://crbug.com/100216 is resolved.
'deprecated': True,
'example_value': False,
'id': 94,
'caption': '''Enable firewall traversal from remote access client''',
'desc': '''Enables usage of STUN and relay servers when connecting to a remote client.
'desc': '''This policy is no longer supported.
Enables usage of STUN and relay servers when connecting to a remote client.

If this setting is enabled, then this machine can discover and connect to remote host machines even if they are separated by a firewall.

Expand Down
2 changes: 0 additions & 2 deletions chrome/browser/policy/configuration_policy_pref_store.cc
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,6 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
{ Value::TYPE_BOOLEAN, kPolicyInstantEnabled, prefs::kInstantEnabled },
{ Value::TYPE_BOOLEAN, kPolicyDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled },
{ Value::TYPE_BOOLEAN, kPolicyRemoteAccessClientFirewallTraversal,
prefs::kRemoteAccessClientFirewallTraversal },
{ Value::TYPE_BOOLEAN, kPolicyRemoteAccessHostFirewallTraversal,
prefs::kRemoteAccessHostFirewallTraversal },
{ Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ INSTANTIATE_TEST_CASE_P(
prefs::kPrintingEnabled),
TypeAndName(kPolicyJavascriptEnabled,
prefs::kWebKitJavascriptEnabled),
TypeAndName(kPolicyRemoteAccessClientFirewallTraversal,
prefs::kRemoteAccessClientFirewallTraversal),
TypeAndName(kPolicyRemoteAccessHostFirewallTraversal,
prefs::kRemoteAccessHostFirewallTraversal),
TypeAndName(kPolicyCloudPrintProxyEnabled,
Expand Down
2 changes: 0 additions & 2 deletions chrome/browser/prefs/browser_prefs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include "chrome/browser/profiles/profile_impl.h"
#include "chrome/browser/profiles/profile_info_cache.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/remoting/firewall_traversal_observer.h"
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
Expand Down Expand Up @@ -175,7 +174,6 @@ void RegisterUserPrefs(PrefService* user_prefs) {
InstantController::RegisterUserPrefs(user_prefs);
NetPrefObserver::RegisterPrefs(user_prefs);
ProtocolHandlerRegistry::RegisterPrefs(user_prefs);
FirewallTraversalObserver::RegisterUserPrefs(user_prefs);
#if defined(OS_MACOSX)
PresentationModePrefs::RegisterUserPrefs(user_prefs);
#endif
Expand Down
98 changes: 0 additions & 98 deletions chrome/browser/remoting/firewall_traversal_observer.cc

This file was deleted.

43 changes: 0 additions & 43 deletions chrome/browser/remoting/firewall_traversal_observer.h

This file was deleted.

51 changes: 0 additions & 51 deletions chrome/browser/remoting/firewall_traversal_observer_unittest.cc

This file was deleted.

2 changes: 0 additions & 2 deletions chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include "chrome/browser/prerender/prerender_tab_helper.h"
#include "chrome/browser/printing/print_preview_message_handler.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/remoting/firewall_traversal_observer.h"
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/browser/renderer_preferences_util.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
Expand Down Expand Up @@ -282,7 +281,6 @@ TabContentsWrapper::TabContentsWrapper(TabContents* contents)
webnavigation_observer_.reset(
new ExtensionWebNavigationTabObserver(contents));
external_protocol_observer_.reset(new ExternalProtocolObserver(contents));
firewall_traversal_observer_.reset(new FirewallTraversalObserver(contents));
plugin_observer_.reset(new PluginObserver(this));
print_preview_.reset(new printing::PrintPreviewMessageHandler(contents));
// Start the in-browser thumbnailing if the feature is enabled.
Expand Down
2 changes: 0 additions & 2 deletions chrome/browser/ui/tab_contents/tab_contents_wrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class ExternalProtocolObserver;
class FaviconTabHelper;
class FileSelectObserver;
class FindTabHelper;
class FirewallTraversalObserver;
class InfoBarTabHelper;
class HistoryTabHelper;
class NavigationController;
Expand Down Expand Up @@ -320,7 +319,6 @@ class TabContentsWrapper : public TabContentsObserver,
scoped_ptr<DownloadRequestLimiterObserver> download_request_limiter_observer_;
scoped_ptr<ExtensionWebNavigationTabObserver> webnavigation_observer_;
scoped_ptr<ExternalProtocolObserver> external_protocol_observer_;
scoped_ptr<FirewallTraversalObserver> firewall_traversal_observer_;
scoped_ptr<PluginObserver> plugin_observer_;
scoped_ptr<printing::PrintPreviewMessageHandler> print_preview_;
scoped_ptr<ThumbnailGenerator> thumbnail_generation_observer_;
Expand Down
2 changes: 0 additions & 2 deletions chrome/chrome_browser.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -1966,8 +1966,6 @@
'browser/protector/settings_change_global_error.cc',
'browser/protector/settings_change_global_error.h',
'browser/remove_rows_table_model.h',
'browser/remoting/firewall_traversal_observer.cc',
'browser/remoting/firewall_traversal_observer.h',
'browser/renderer_host/chrome_render_message_filter.cc',
'browser/renderer_host/chrome_render_message_filter.h',
'browser/renderer_host/chrome_render_view_host_observer.cc',
Expand Down
1 change: 0 additions & 1 deletion chrome/chrome_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,6 @@
'browser/profiles/profile_dependency_manager_unittest.cc',
'browser/profiles/profile_info_cache_unittest.cc',
'browser/profiles/profile_manager_unittest.cc',
'browser/remoting/firewall_traversal_observer_unittest.cc',
'browser/renderer_host/web_cache_manager_unittest.cc',
'browser/resources_util_unittest.cc',
'browser/rlz/rlz_unittest.cc',
Expand Down
2 changes: 0 additions & 2 deletions chrome/common/pref_names.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1448,8 +1448,6 @@ const char kLoginDatabaseMigrated[] = "login_database.migrated";

// Boolean that indicates whether to allow firewall traversal while trying to
// establish the initial connection from the client or host.
const char kRemoteAccessClientFirewallTraversal[] =
"remote_access.client_firewall_traversal";
const char kRemoteAccessHostFirewallTraversal[] =
"remote_access.host_firewall_traversal";

Expand Down
1 change: 0 additions & 1 deletion chrome/common/pref_names.h
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,6 @@ extern const char kGeolocationContentSettings[];

extern const char kLoginDatabaseMigrated[];

extern const char kRemoteAccessClientFirewallTraversal[];
extern const char kRemoteAccessHostFirewallTraversal[];

extern const char kCloudPrintServiceURL[];
Expand Down
1 change: 0 additions & 1 deletion chrome/test/functional/policy_prefs_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ class PolicyPrefsUITest(pyauto.PyUITest):
'IncognitoEnabled': (False, []),
'IncognitoModeAvailability': (1, []),
'SavingBrowserHistoryDisabled': (True, []),
'RemoteAccessClientFirewallTraversal': (True, []),
'RemoteAccessHostFirewallTraversal': (True, []),
'PrintingEnabled': (False, []),
# Note: supported_on is empty for this policy.
Expand Down
3 changes: 0 additions & 3 deletions chrome/test/ui/ppapi_uitest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,6 @@ TEST_PPAPI_OUT_OF_PROCESS(PostMessage)
TEST_PPAPI_IN_PROCESS(Memory)
TEST_PPAPI_OUT_OF_PROCESS(Memory)

TEST_PPAPI_IN_PROCESS(QueryPolicy)
//TEST_PPAPI_OUT_OF_PROCESS(QueryPolicy)

TEST_PPAPI_IN_PROCESS(VideoDecoder)
TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)

Expand Down
12 changes: 0 additions & 12 deletions content/common/view_messages.h
Original file line number Diff line number Diff line change
Expand Up @@ -1186,13 +1186,6 @@ IPC_MESSAGE_ROUTED3(ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks,
std::vector<FilePath> /* paths of local copy */,
FilePath /* local directory path */)

// Sends updated information about the client firewall traversal policy.
// |traversal_data| is a json string containing policy information.
// Sent due to a policy change or in response to a
// ViewHostMsg_RequestRemoteAccessClientFirewallTraversal message.
IPC_MESSAGE_ROUTED1(ViewMsg_UpdateRemoteAccessClientFirewallTraversal,
std::string /* traversal_data */)

// Tells the render side that a ViewHostMsg_LockMouse message has been
// processed. |succeeded| indicates whether the mouse has been successfully
// locked or not.
Expand Down Expand Up @@ -1943,11 +1936,6 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_SendSerializedHtmlData,
std::string /* data buffer */,
int32 /* complete status */)

// Request updated information about the client firewall traversal policy.
// Will result in a ViewMsg_UpdateRemoteAccessClientFirewallTraversal message
// being sent back.
IPC_MESSAGE_ROUTED0(ViewHostMsg_RequestRemoteAccessClientFirewallTraversal)

// Notifies the browser of an event occurring in the media pipeline.
IPC_MESSAGE_CONTROL1(ViewHostMsg_MediaLogEvent,
media::MediaLogEvent /* event */)
Expand Down
Loading

0 comments on commit 5bc5c15

Please sign in to comment.