Implement newly saved card bubble for realz and update generated card bubble to

chrome/chrome_tests_unit.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': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 1322 matching lines @@
         'browser/ui/ash/event_rewriter_unittest.cc',
         'browser/ui/ash/ime_controller_chromeos_unittest.cc',
         'browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc',
         'browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc',
         'browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.cc',
         'browser/ui/ash/launcher/launcher_context_menu_unittest.cc',
         'browser/ui/ash/screenshot_taker_unittest.cc',
         'browser/ui/ash/window_positioner_unittest.cc',
         'browser/ui/autofill/account_chooser_model_unittest.cc',
         'browser/ui/autofill/autocheckout_bubble_controller_unittest.cc',
-        'browser/ui/autofill/autofill_credit_card_bubble_controller_unittest.cc',
-        'browser/ui/autofill/autofill_dialog_controller_unittest.cc',
         'browser/ui/autofill/autofill_dialog_models_unittest.cc',
         'browser/ui/autofill/autofill_dialog_types_unittest.cc',
         'browser/ui/autofill/autofill_popup_controller_unittest.cc',
         'browser/ui/autofill/data_model_wrapper_unittest.cc',
         'browser/ui/autofill/mock_autofill_dialog_view_delegate.cc',
         'browser/ui/autofill/mock_autofill_dialog_view_delegate.h',
-        'browser/ui/autofill/test_autofill_credit_card_bubble.cc',
-        'browser/ui/autofill/test_autofill_credit_card_bubble.h',
         'browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc',
         'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc',
         'browser/ui/bookmarks/bookmark_editor_unittest.cc',
         'browser/ui/bookmarks/bookmark_prompt_controller_unittest.cc',
         'browser/ui/bookmarks/bookmark_ui_utils_unittest.cc',
         'browser/ui/bookmarks/bookmark_unittest.cc',
         'browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc',
         'browser/ui/browser_command_controller_unittest.cc',
         'browser/ui/browser_iterator_unittest.cc',
         'browser/ui/browser_unittest.cc',
@@ skipping 1173 matching lines @@
             ['exclude', '^utility/importer/'],
           ],
           'conditions': [
             ['gtest_target_type == "shared_library"', {
               'dependencies': [
                 '../testing/android/native_test.gyp:native_test_native_code',
                 'chrome.gyp:chrome_android_auxiliary',
               ],
             }],
           ],
+        }, { # OS!="android"
+          'sources': [
+            'browser/ui/autofill/autofill_dialog_controller_unittest.cc',
+            'browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc',
+            'browser/ui/autofill/mock_new_credit_card_bubble_controller.cc',
+            'browser/ui/autofill/mock_new_credit_card_bubble_controller.h',
+            'browser/ui/autofill/test_generated_credit_card_bubble.cc',
+            'browser/ui/autofill/test_generated_credit_card_bubble.h',
+          ],
         }],  # OS == android
         ['enable_themes==0', {
           'sources!': [
             'browser/ui/webui/theme_source_unittest.cc',
           ],
           'sources/': [
             ['exclude', '^browser/themes/'],
           ],
         }],
         ['toolkit_views==1', {
@@ skipping 151 matching lines @@
               # more details.
               'DebugInformationFormat': '3',
               'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
             },
           },
         },
       ],
     }],
   ],  # 'conditions'
 }