Revert 175073 because it fails to compile on Linux.

chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2440 matching lines @@
             'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
           ],
           'sources/': [
             ['exclude', '^browser/safe_browsing/'],
             ['include', '^browser/safe_browsing/safe_browsing_tab_observer.cc'],
             ['include', '^browser/safe_browsing/safe_browsing_tab_observer.h'],
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
+            'mtp_file_entry_proto',
+            'mtp_storage_info_proto',
             '../build/linux/system.gyp:udev',
-            '../device/device.gyp:device_media_transfer_protocol',
+          ],
+          'sources': [
+            'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc',
+            'browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h',
+            'browser/media_transfer_protocol/media_transfer_protocol_manager.cc',
+            'browser/media_transfer_protocol/media_transfer_protocol_manager.h',
           ],
         }],
         ['OS=="linux" and chromeos==0', {
           'dependencies': [
             '../build/linux/system.gyp:libspeechd',
           ],
         }],
         ['chromeos==0', {
           'sources!': [
             'browser/extensions/api/input_ime/input_ime_api.cc',
@@ skipping 637 matching lines @@
             'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java',
           ],
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
+    ['OS=="linux"', {
+      'targets': [
+        {
+          # Protobuf compiler / generator for the MtpFileEntry and
+          # MtpFileEntries protocol buffers.
+          'target_name': 'mtp_file_entry_proto',
+          'type': 'static_library',
+          'sources': [
+            '../third_party/cros_system_api/dbus/mtp_file_entry.proto',
+          ],
+          'variables': {
+            'proto_in_dir': '../third_party/cros_system_api/dbus',
+            'proto_out_dir': 'chrome/browser/media_transfer_protocol',
+          },
+          'includes': ['../build/protoc.gypi'],
+        },
+        {
+          # Protobuf compiler / generator for the MtpStorageInfo protocol
+          # buffer.
+          'target_name': 'mtp_storage_info_proto',
+          'type': 'static_library',
+          'sources': [
+            '../third_party/cros_system_api/dbus/mtp_storage_info.proto',
+          ],
+          'variables': {
+            'proto_in_dir': '../third_party/cros_system_api/dbus',
+            'proto_out_dir': 'chrome/browser/media_transfer_protocol',
+          },
+          'includes': ['../build/protoc.gypi'],
+        },
+      ],
+     },
+    ],
   ],
 }