Fix compilation with disabled remoting.

There are two issues fixed:
 1. Code didn't compile.
 2. The remoting section in option was shown even without --enable-remoting.

BUG=None
TEST=Try to compile with remoting=0 and verify that Remoting doesn't show up in advanced options

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

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

build/common.gypi

@@ -119,6 +119,9 @@
       # Set to select the Title Case versions of strings in GRD files.
       'use_titlecase_in_grd_files%': 0,
 
+      # Remoting compilation is enabled by default. Set to 0 to disable.
+      'remoting%': 1,
+
       'conditions': [
         # A flag to enable or disable our compile-time dependency
         # on gnome-keyring. If that dependency is disabled, no gnome-keyring
@@ -173,6 +176,7 @@
     'library%': '<(library)',
     'component%': '<(component)',
     'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
+    'remoting%': '<(remoting)',
 
     # The release channel that this build targets. This is used to restrict
     # channel-specific build options, like which installer packages to create.
@@ -333,9 +337,6 @@
     # from the system include dirs.
     'system_libcros%': 0,
 
-    # Remoting compilation is enabled by default. Set to 0 to disable.
-    'remoting%': 1,
-
     # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
     # so Cocoa is happy (http://crbug.com/20441).
     'locales': [
@@ -449,6 +450,9 @@
       ['touchui==1', {
         'grit_defines': ['-D', 'touchui'],
       }],
+      ['remoting==1', {
+        'grit_defines': ['-D', 'remoting'],
+      }],
       ['use_titlecase_in_grd_files==1', {
         'grit_defines': ['-D', 'use_titlecase'],
       }],

chrome/browser/resources/options/advanced_options.html

@@ -200,6 +200,8 @@
       </div>
     </div>
   </section>
+</if>
+<if expr="pp_ifdef('remoting') and not pp_ifdef('chromeos')">
   <section id="remoting-section">
     <h3 i18n-content="advancedSectionTitleRemoting"></h3>
     <div>

chrome/chrome.gyp

@@ -1170,9 +1170,13 @@
         }],
         ['remoting==1', {
           'dependencies': [
-            '../remoting/remoting.gyp:chromoting_base',
             '../remoting/remoting.gyp:chromoting_host',
-            '../remoting/remoting.gyp:chromoting_jingle_glue',
+          ],
+        }],
+        ['remoting==0', {
+          'sources!': [
+            'service/remoting/chromoting_host_manager.cc',
+            'service/remoting/chromoting_host_manager.h',
           ],
         }],
       ],