Merge FavoriteState into NetworkState

chromeos/chromeos.gyp

 # Copyright (c) 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'chromeos_tools.gypi'
@@ skipping 256 matching lines @@
         'login/login_state.cc',
         'login/login_state.h',
         'network/certificate_pattern.cc',
         'network/certificate_pattern.h',
         'network/client_cert_resolver.cc',
         'network/client_cert_resolver.h',
         'network/client_cert_util.cc',
         'network/client_cert_util.h',
         'network/device_state.cc',
         'network/device_state.h',
-        'network/favorite_state.cc',
-        'network/favorite_state.h',
         'network/geolocation_handler.cc',
         'network/geolocation_handler.h',
         'network/managed_network_configuration_handler.cc',
         'network/managed_network_configuration_handler.h',
         'network/managed_network_configuration_handler_impl.cc',
         'network/managed_network_configuration_handler_impl.h',
         'network/managed_state.cc',
         'network/managed_state.h',
         'network/network_activation_handler.cc',
         'network/network_activation_handler.h',
@@ skipping 313 matching lines @@
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
 
   ],
 }