Extension Settings API: make it so that when changes received from Sync fail to

chrome/chrome_browser.gypi

 # Copyright (c) 2011 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',
       'dependencies': [
@@ skipping 1172 matching lines @@
         'browser/extensions/pending_extension_info.cc',
         'browser/extensions/pending_extension_info.h',
         'browser/extensions/pending_extension_manager.cc',
         'browser/extensions/pending_extension_manager.h',
         'browser/extensions/process_map.cc',
         'browser/extensions/process_map.h',
         'browser/extensions/sandboxed_extension_unpacker.cc',
         'browser/extensions/sandboxed_extension_unpacker.h',
         'browser/extensions/settings/failing_settings_storage.cc',
         'browser/extensions/settings/failing_settings_storage.h',
-        'browser/extensions/settings/in_memory_settings_storage.cc',
-        'browser/extensions/settings/in_memory_settings_storage.h',
         'browser/extensions/settings/setting_change.cc',
         'browser/extensions/settings/setting_change.h',
         'browser/extensions/settings/setting_sync_data.cc',
         'browser/extensions/settings/setting_sync_data.h',
         'browser/extensions/settings/settings_api.cc',
         'browser/extensions/settings/settings_api.h',
         'browser/extensions/settings/settings_backend.cc',
         'browser/extensions/settings/settings_backend.h',
         'browser/extensions/settings/settings_frontend.cc',
         'browser/extensions/settings/settings_frontend.h',
         'browser/extensions/settings/settings_leveldb_storage.cc',
         'browser/extensions/settings/settings_leveldb_storage.h',
         'browser/extensions/settings/settings_observer.cc',
         'browser/extensions/settings/settings_observer.h',
         'browser/extensions/settings/settings_storage.cc',
         'browser/extensions/settings/settings_storage.h',
         'browser/extensions/settings/settings_storage_cache.cc',
         'browser/extensions/settings/settings_storage_cache.h',
         'browser/extensions/settings/settings_storage_factory.h',
         'browser/extensions/settings/settings_storage_quota_enforcer.cc',
         'browser/extensions/settings/settings_storage_quota_enforcer.h',
         'browser/extensions/settings/settings_sync_util.cc',
         'browser/extensions/settings/settings_sync_util.h',
         'browser/extensions/settings/syncable_settings_storage.cc',
         'browser/extensions/settings/syncable_settings_storage.h',
+        'browser/extensions/settings/testing_settings_storage.cc',
+        'browser/extensions/settings/testing_settings_storage.h',
         'browser/extensions/theme_installed_infobar_delegate.cc',
         'browser/extensions/theme_installed_infobar_delegate.h',
         'browser/extensions/unpacked_installer.cc',
         'browser/extensions/unpacked_installer.h',
         'browser/extensions/user_script_listener.cc',
         'browser/extensions/user_script_listener.h',
         'browser/extensions/user_script_master.cc',
         'browser/extensions/user_script_master.h',
         'browser/extensions/webstore_inline_installer.cc',
         'browser/extensions/webstore_inline_installer.h',
@@ skipping 4010 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }