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

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index a99d73bfd97578d6f533e5c5d960ff839d38ee48..499f0b160478fd879a0356fab53707787a66509b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1349,16 +1349,12 @@
         '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',
@@ -2554,6 +2550,15 @@
               ],
             }],
           ],
+        }, { # OS!="android"
+          'sources': [
+            'browser/ui/autofill/autofill_dialog_controller_unittest.cc',

[Lei Zhang, 2013/08/09 04:51:57]

Rather than adding the os!=android section here, just stick with the existing
paradigm - list all the files, and exclude the ones you don't use in the
OS==android section.

[Dan Beam, 2013/08/09 18:56:54]

Done.

+            '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_view.cc',
+            'browser/ui/autofill/test_generated_credit_card_bubble_view.h',
+          ],
         }],  # OS == android
         ['enable_themes==0', {
           'sources!': [