Enable devices page UI on MacOSX

Enable devices page UI on MacOSX

Changes:

1. Consolidate the logic of "ENABLE_MDNS or OS_MACOSX" into a single C++/grit/ninja define called "enable_service_discovery"
2. Move a bunch of files from being conditioned on enable_mdns to being conditioned on enable_service_discovery.
3. Create a separate, simplified PrivetHTTPAsynchronousFactory that synchronously returns a PrivetHTTPClient for the mDNS host and port
without resolving, since on OSX mDNS resolution is baked into the operating system.

BUG=352811
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258480

[Noam Samuel, 2014-03-17 17:30:38]

sky@ for chrome/browser/ui/toolbar
mfoltz@ for chrome/browser/extensions/api/mdns/
pam@ for chrome/browser/perfs/
dbeam@ for chrome/browser/ui/webui/options/
erg@ for chrome/browser/profiles/

[sky, 2014-03-17 17:37:36]

chrome/browser/ui/toolbar/origin_chip_info.cc LGTM

[Vitaly Buka (NO REVIEWS), 2014-03-17 17:39:02]

lgtm

[Elliot Glaysher, 2014-03-17 18:06:49]

trivial ifdef change in profiles lgtm

[Noam Samuel, 2014-03-19 18:23:04]

-pam@
+bauerb@ for chrome/browser/prefs/

[Dan Beam, 2014-03-19 19:15:41]

lgtm

[mark a. foltz, 2014-03-19 22:25:43]

lgtm

[Bernhard Bauer, 2014-03-20 09:03:14]

c/b/prefs LGTM with a nit:

https://codereview.chromium.org/195983023/diff/60001/chrome/browser/prefs/bro...
File chrome/browser/prefs/browser_prefs.cc (right):

https://codereview.chromium.org/195983023/diff/60001/chrome/browser/prefs/bro...
chrome/browser/prefs/browser_prefs.cc:400: #if defined(ENABLE_SERVICE_DISCOVERY)
Can you move this to after ENABLE_NOTIFICATIONS, so these are sorted by #ifdef?

[Noam Samuel, 2014-03-20 16:50:57]

https://codereview.chromium.org/195983023/diff/60001/chrome/browser/prefs/bro...
File chrome/browser/prefs/browser_prefs.cc (right):

https://codereview.chromium.org/195983023/diff/60001/chrome/browser/prefs/bro...
chrome/browser/prefs/browser_prefs.cc:400: #if defined(ENABLE_SERVICE_DISCOVERY)
On 2014/03/20 09:03:14, Bernhard Bauer wrote:
> Can you move this to after ENABLE_NOTIFICATIONS, so these are sorted by
#ifdef?

Done.

[Noam Samuel, 2014-03-20 16:51:03]

The CQ bit was checked by noamsml@chromium.org

[commit-bot: I haz the power, 2014-03-20 16:52:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/195983023/80001

[commit-bot: I haz the power, 2014-03-20 16:52:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 16:52:54]

Failed to apply patch for build/common.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/common.gypi
  Hunk #1 FAILED at 515.
  Hunk #2 FAILED at 994.
  Hunk #3 FAILED at 1797.
  Hunk #4 succeeded at 1848 (offset 33 lines).
  Hunk #5 FAILED at 2496.
  4 out of 5 hunks FAILED -- saving rejects to file build/common.gypi.rej

Patch:       build/common.gypi
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index
72eb96d94c07528ee98e90e0bdf56958f8bef7b5..d6fff92783af3e7adb95c2ce16da21f84162dbec
100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -515,6 +515,7 @@
       'spdy_proxy_auth_value%' : '',
       'data_reduction_proxy_probe_url%' : '',
       'enable_mdns%' : 0,
+      'enable_service_discovery%': 0,
       'enable_enhanced_bookmarks%': 0,
       'enable_hangout_services_extension%': 0,
 
@@ -994,6 +995,7 @@
     'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
     'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
     'enable_mdns%' : '<(enable_mdns)',
+    'enable_service_discovery%' : '<(enable_service_discovery)',
     'enable_enhanced_bookmarks%' : '<(enable_enhanced_bookmarks)',
     'enable_hangout_services_extension%' :
'<(enable_hangout_services_extension)',
     'v8_optimized_debug%': '<(v8_optimized_debug)',
@@ -1797,9 +1799,6 @@
       ['enable_webrtc==1', {
         'grit_defines': ['-D', 'enable_webrtc'],
       }],
-      ['enable_mdns==1', {
-        'grit_defines': ['-D', 'enable_mdns'],
-      }],
       ['enable_enhanced_bookmarks==1', {
         'grit_defines': ['-D', 'enable_enhanced_bookmarks'],
       }],
@@ -1815,6 +1814,10 @@
       ['enable_resource_whitelist_generation==1', {
         'grit_rc_header_format': ['-h', '#define {textual_id}
_Pragma("{textual_id}") {numeric_id}'],
       }],
+      ['enable_mdns==1 or OS=="mac"', {
+        'grit_defines': ['-D', 'enable_service_discovery'],
+        'enable_service_discovery%': 1
+      }],
       ['clang_use_chrome_plugins==1 and OS!="win"', {
         'clang_chrome_plugins_flags': [
           '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
@@ -2492,6 +2495,9 @@
       ['enable_mdns==1', {
         'defines': ['ENABLE_MDNS=1'],
       }],
+      ['enable_service_discovery==1', {
+        'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
+      }],
       ['enable_enhanced_bookmarks==1', {
         'defines': ['ENABLE_ENHANCED_BOOKMARKS=1'],
       }],

[Noam Samuel, 2014-03-20 17:10:52]

The CQ bit was checked by noamsml@chromium.org

[commit-bot: I haz the power, 2014-03-20 17:11:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/195983023/100001

[commit-bot: I haz the power, 2014-03-20 18:40:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 18:40:24]

Try jobs failed on following builders:
  tryserver.chromium on mac_chromium_compile_dbg

[Noam Samuel, 2014-03-20 20:11:07]

On 2014/03/20 18:40:24, I haz the power (commit-bot) wrote:
> Try jobs failed on following builders:
>   tryserver.chromium on mac_chromium_compile_dbg

Disabling the test that didn't compile for now. I'll introduce it in a separate
CL since it requires compiling Chrome's builtin mDNS/DNS-SD for OSX (perhaps
adding it to test-support-unit in that case?).

[Noam Samuel, 2014-03-20 20:11:21]

On 2014/03/20 20:11:07, Noam Samuel wrote:
> On 2014/03/20 18:40:24, I haz the power (commit-bot) wrote:
> > Try jobs failed on following builders:
> >   tryserver.chromium on mac_chromium_compile_dbg
> 
> Disabling the test that didn't compile for now. I'll introduce it in a
separate
> CL since it requires compiling Chrome's builtin mDNS/DNS-SD for OSX (perhaps
> adding it to test-support-unit in that case?).

Disabling => Not compiling on OSX

[Noam Samuel, 2014-03-20 20:16:14]

The CQ bit was checked by noamsml@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:18:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/195983023/120001

[commit-bot: I haz the power, 2014-03-20 20:18:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:18:44]

Failed to apply patch for build/common.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/common.gypi
  Hunk #2 succeeded at 1022 (offset 10 lines).
  Hunk #3 succeeded at 1855 (offset 20 lines).
  Hunk #4 succeeded at 1867 (offset 20 lines).
  Hunk #5 succeeded at 2548 (offset 20 lines).
  Hunk #6 FAILED at 3005.
  1 out of 6 hunks FAILED -- saving rejects to file build/common.gypi.rej

Patch:       build/common.gypi
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index
99d200859898b9306694d1f369d56e36f4b21772..27582861a9e9d3531ec8d4181e302098fc6bad22
100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -526,6 +526,7 @@
       'spdy_proxy_auth_value%' : '',
       'data_reduction_proxy_probe_url%' : '',
       'enable_mdns%' : 0,
+      'enable_service_discovery%': 0,
       'enable_hangout_services_extension%': 0,
 
        # Enable the Syzygy optimization step.
@@ -1011,6 +1012,7 @@
     'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
     'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)',
     'enable_mdns%' : '<(enable_mdns)',
+    'enable_service_discovery%' : '<(enable_service_discovery)',
     'enable_hangout_services_extension%' :
'<(enable_hangout_services_extension)',
     'v8_optimized_debug%': '<(v8_optimized_debug)',
     'proprietary_codecs%': '<(proprietary_codecs)',
@@ -1833,9 +1835,6 @@
       ['enable_webrtc==1', {
         'grit_defines': ['-D', 'enable_webrtc'],
       }],
-      ['enable_mdns==1', {
-        'grit_defines': ['-D', 'enable_mdns'],
-      }],
       ['enable_hangout_services_extension==1', {
         'grit_defines': ['-D', 'enable_hangout_services_extension'],
       }],
@@ -1848,6 +1847,10 @@
       ['enable_resource_whitelist_generation==1', {
         'grit_rc_header_format': ['-h', '#define {textual_id}
_Pragma("{textual_id}") {numeric_id}'],
       }],
+      ['enable_mdns==1 or OS=="mac"', {
+        'grit_defines': ['-D', 'enable_service_discovery'],
+        'enable_service_discovery%': 1
+      }],
       ['clang_use_chrome_plugins==1 and OS!="win"', {
         'clang_chrome_plugins_flags': [
           '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
@@ -2525,6 +2528,9 @@
       ['enable_mdns==1', {
         'defines': ['ENABLE_MDNS=1'],
       }],
+      ['enable_service_discovery==1', {
+        'defines' : [ 'ENABLE_SERVICE_DISCOVERY=1' ],
+      }],
       ['enable_hangout_services_extension==1', {
         'defines': ['ENABLE_HANGOUT_SERVICES_EXTENSION=1'],
       }],
@@ -2999,7 +3005,7 @@
     },
   },
   'conditions': [
-    # TODO(jochen): Enable this on chromeos. http://crbug.com/353127 
+    # TODO(jochen): Enable this on chromeos. http://crbug.com/353127
     ['os_posix==1 and chromeos==0', {
       'target_defaults': {
         'ldflags': [

[Noam Samuel, 2014-03-20 20:25:11]

The CQ bit was checked by noamsml@chromium.org

[commit-bot: I haz the power, 2014-03-20 20:28:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/195983023/140001

[commit-bot: I haz the power, 2014-03-21 00:58:59]

Change committed as 258480