Moved local discover code to chrome/utility for sandboxing.

BUG=245391

Review URL: https://chromiumcodereview.appspot.com/18568002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210179 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 50 insertions, 42 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 8b13695..2ecf096 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -290,6 +290,7 @@
             '../content/content.gyp:content_utility',
             '../skia/skia.gyp:skia',
             '../third_party/libxml/libxml.gyp:libxml',
+            'common',
           ],
           'sources': [
             'utility/chrome_content_utility_client.cc',
@@ -325,6 +326,14 @@
                 'utility/profile_import_handler.cc',
               ],
             }],
+            ['enable_mdns == 1', {
+              'sources': [
+                'utility/local_discovery/local_domain_resolver.cc',
+                'utility/local_discovery/local_domain_resolver.h',
+                'utility/local_discovery/service_discovery_client_impl.cc',
+                'utility/local_discovery/service_discovery_client_impl.h',
+              ]
+            }],
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8c8efcb..d653fa0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1790,12 +1790,6 @@
         'browser/service/service_process_control.cc',
         'browser/service/service_process_control_mac.mm',
         'browser/service/service_process_control.h',
-        'browser/local_discovery/local_domain_resolver.cc',
-        'browser/local_discovery/local_domain_resolver.h',
-        'browser/local_discovery/service_discovery_client.cc',
-        'browser/local_discovery/service_discovery_client.h',
-        'browser/local_discovery/service_discovery_client_impl.cc',
-        'browser/local_discovery/service_discovery_client_impl.h',
         'browser/sessions/base_session_service.cc',
         'browser/sessions/base_session_service.h',
         'browser/sessions/persistent_tab_restore_service.cc',
@@ -3172,16 +3166,6 @@
             'browser/media/webrtc_logging_handler_host.h',
           ]
         }],
-        ['enable_mdns != 1', {
-            'sources!': [
-              'browser/local_discovery/local_domain_resolver.cc',
-              'browser/local_discovery/local_domain_resolver.h',
-              'browser/local_discovery/service_discovery_client.cc',
-              'browser/local_discovery/service_discovery_client.h',
-              'browser/local_discovery/service_discovery_client_impl.cc',
-              'browser/local_discovery/service_discovery_client_impl.h',
-            ]
-        }],
       ],
       'target_conditions': [
         # Need 'target_conditions' to override default filename_rules to include
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2082620..13c6248 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -557,6 +557,12 @@
             'common/crash_keys.h',
           ],
         }],
+        ['enable_mdns == 1', {
+            'sources': [
+              'common/local_discovery/service_discovery_client.cc',
+              'common/local_discovery/service_discovery_client.h',
+            ]
+        }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e14bd45..9ec897a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3387,9 +3387,9 @@
           'type': 'executable',
           'dependencies': [
             '../net/net.gyp:net',
-            'browser',
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
+            'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 1f62c09..2a20059 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1144,8 +1144,6 @@
         'browser/sessions/session_backend_unittest.cc',
         'browser/sessions/session_service_unittest.cc',
         'browser/sessions/session_types_unittest.cc',
-        'browser/local_discovery/local_domain_resolver_unittest.cc',
-        'browser/local_discovery/service_discovery_client_unittest.cc',
         'browser/shell_integration_unittest.cc',
         'browser/shell_integration_win_unittest.cc',
         'browser/signin/fake_auth_status_provider.cc',
@@ -2052,6 +2050,12 @@
             'browser/ui/views/select_file_dialog_extension_unittest.cc',
           ],
         }],
+        ['enable_mdns == 1', {
+            'sources': [
+              'utility/local_discovery/local_domain_resolver_unittest.cc',
+              'utility/local_discovery/service_discovery_client_unittest.cc',
+            ]
+        }],
         ['configuration_policy==0', {
           'sources!': [
             'browser/extensions/api/storage/policy_value_store_unittest.cc',
@@ -2518,12 +2522,6 @@
             ['exclude', '^browser/extensions/blacklist_unittest.cc'],
           ],
         }],
-        ['enable_mdns != 1', {
-            'sources!' : [
-              'browser/local_discovery/local_domain_resolver_unittest.cc',
-              'browser/local_discovery/service_discovery_client_unittest.cc',
-            ],
-        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {
diff --git a/chrome/common/local_discovery/OWNERS b/chrome/common/local_discovery/OWNERS
new file mode 100644
index 0000000..a0508fc
--- /dev/null
+++ b/chrome/common/local_discovery/OWNERS
@@ -0,0 +1,3 @@
+gene@chromium.org
+noamsml@chromium.org
+vitalybuka@chromium.org
diff --git a/chrome/browser/local_discovery/service_discovery_client.cc b/chrome/common/local_discovery/service_discovery_client.cc
index 0b63b85..36faf6d 100644
--- a/chrome/browser/local_discovery/service_discovery_client.cc
+++ b/chrome/common/local_discovery/service_discovery_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/local_discovery/service_discovery_client.h"
+#include "chrome/common/local_discovery/service_discovery_client.h"
 
 namespace local_discovery {
 
diff --git a/chrome/browser/local_discovery/service_discovery_client.h b/chrome/common/local_discovery/service_discovery_client.h
index ceeca7a..82f5e6f 100644
--- a/chrome/browser/local_discovery/service_discovery_client.h
+++ b/chrome/common/local_discovery/service_discovery_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
-#define CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
+#ifndef CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
+#define CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
 
 #include <string>
 #include <vector>
@@ -134,4 +134,4 @@ class ServiceDiscoveryClient {
 
 }  // namespace local_discovery
 
-#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
+#endif  // CHROME_COMMON_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_H_
diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS
index b5d4427..86737fb 100644
--- a/chrome/tools/DEPS
+++ b/chrome/tools/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+breakpad",
   "+chrome/browser",
   "+chrome/third_party/hunspell/google",
+  "+chrome/utility/local_discovery",
   "+content/browser",
   "+content/public/browser",
 ]
diff --git a/chrome/tools/service_discovery_sniffer/DEPS b/chrome/tools/service_discovery_sniffer/DEPS
new file mode 100644
index 0000000..e002118
--- /dev/null
+++ b/chrome/tools/service_discovery_sniffer/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+chrome/utility/local_discovery",
+]
diff --git a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc
index bf416b2..989b408 100644
--- a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc
+++ b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.cc
@@ -8,8 +8,8 @@
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "chrome/browser/local_discovery/service_discovery_client_impl.h"
 #include "chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h"
+#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/mdns_client.h"
 
 namespace local_discovery {
diff --git a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h
index 12f8793..0858756 100644
--- a/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h
+++ b/chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/memory/linked_ptr.h"
-#include "chrome/browser/local_discovery/service_discovery_client.h"
+#include "chrome/common/local_discovery/service_discovery_client.h"
 
 namespace local_discovery {
 
diff --git a/chrome/utility/DEPS b/chrome/utility/DEPS
index 8fa5799..50c03d0 100644
--- a/chrome/utility/DEPS
+++ b/chrome/utility/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   # For out of process profile import. This code needs to be factored out to
   # chrome/common.
   "+chrome/browser/importer",
+  "+chrome/common/local_discovery",  
   "+content/public/child",
   "+content/public/utility",
   "+webkit/glue",
diff --git a/chrome/utility/local_discovery/OWNERS b/chrome/utility/local_discovery/OWNERS
new file mode 100644
index 0000000..a0508fc
--- /dev/null
+++ b/chrome/utility/local_discovery/OWNERS
@@ -0,0 +1,3 @@
+gene@chromium.org
+noamsml@chromium.org
+vitalybuka@chromium.org
diff --git a/chrome/browser/local_discovery/local_domain_resolver.cc b/chrome/utility/local_discovery/local_domain_resolver.cc
index bb5e563..abe629d 100644
--- a/chrome/browser/local_discovery/local_domain_resolver.cc
+++ b/chrome/utility/local_discovery/local_domain_resolver.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
-#include "chrome/browser/local_discovery/local_domain_resolver.h"
+#include "chrome/utility/local_discovery/local_domain_resolver.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/record_parsed.h"
 #include "net/dns/record_rdata.h"
diff --git a/chrome/browser/local_discovery/local_domain_resolver.h b/chrome/utility/local_discovery/local_domain_resolver.h
index 6c0c50d..dc17e9d 100644
--- a/chrome/browser/local_discovery/local_domain_resolver.h
+++ b/chrome/utility/local_discovery/local_domain_resolver.h
@@ -9,8 +9,8 @@
 #include "net/base/net_util.h"
 #include "net/dns/mdns_client.h"
 
-#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_LOCAL_DOMAIN_RESOLVER_H_
-#define CHROME_BROWSER_LOCAL_DISCOVERY_LOCAL_DOMAIN_RESOLVER_H_
+#ifndef CHROME_UTILITY_LOCAL_DISCOVERY_LOCAL_DOMAIN_RESOLVER_H_
+#define CHROME_UTILITY_LOCAL_DISCOVERY_LOCAL_DOMAIN_RESOLVER_H_
 
 namespace local_discovery {
 
@@ -53,4 +53,4 @@ class LocalDomainResolver {
 
 }  // namespace local_discovery
 
-#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_LOCAL_DOMAIN_RESOLVER_H_
+#endif  // CHROME_UTILITY_LOCAL_DISCOVERY_LOCAL_DOMAIN_RESOLVER_H_
diff --git a/chrome/browser/local_discovery/local_domain_resolver_unittest.cc b/chrome/utility/local_discovery/local_domain_resolver_unittest.cc
index f810e13..c0530af 100644
--- a/chrome/browser/local_discovery/local_domain_resolver_unittest.cc
+++ b/chrome/utility/local_discovery/local_domain_resolver_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/local_discovery/local_domain_resolver.h"
+#include "chrome/utility/local_discovery/local_domain_resolver.h"
 #include "net/dns/mdns_client_impl.h"
 #include "net/dns/mock_mdns_socket_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_impl.cc b/chrome/utility/local_discovery/service_discovery_client_impl.cc
index 219f5ed..724ccb0 100644
--- a/chrome/browser/local_discovery/service_discovery_client_impl.cc
+++ b/chrome/utility/local_discovery/service_discovery_client_impl.cc
@@ -8,7 +8,7 @@
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
-#include "chrome/browser/local_discovery/service_discovery_client_impl.h"
+#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/record_rdata.h"
 
diff --git a/chrome/browser/local_discovery/service_discovery_client_impl.h b/chrome/utility/local_discovery/service_discovery_client_impl.h
index 13765e0..1e1ca70 100644
--- a/chrome/browser/local_discovery/service_discovery_client_impl.h
+++ b/chrome/utility/local_discovery/service_discovery_client_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
-#define CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
+#ifndef CHROME_UTILITY_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
+#define CHROME_UTILITY_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
 
 #include <map>
 #include <string>
@@ -14,7 +14,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
-#include "chrome/browser/local_discovery/service_discovery_client.h"
+#include "chrome/common/local_discovery/service_discovery_client.h"
 #include "net/dns/mdns_client.h"
 
 namespace local_discovery {
@@ -201,4 +201,4 @@ class ServiceResolverImpl
 
 }  // namespace local_discovery
 
-#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
+#endif  // CHROME_UTILITY_LOCAL_DISCOVERY_SERVICE_DISCOVERY_CLIENT_IMPL_H_
diff --git a/chrome/browser/local_discovery/service_discovery_client_unittest.cc b/chrome/utility/local_discovery/service_discovery_client_unittest.cc
index 9a7d90a..1602a06 100644
--- a/chrome/browser/local_discovery/service_discovery_client_unittest.cc
+++ b/chrome/utility/local_discovery/service_discovery_client_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/local_discovery/service_discovery_client_impl.h"
+#include "chrome/utility/local_discovery/service_discovery_client_impl.h"
 #include "net/base/net_errors.h"
 #include "net/dns/dns_protocol.h"
 #include "net/dns/mdns_client_impl.h"