[rAc] Move email address into billing address section.

chrome/browser/ui/cocoa/autofill/autofill_details_container_unittest.mm

 // Copyright (c) 2013 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.
 
 #import "chrome/browser/ui/cocoa/autofill/autofill_details_container.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/autofill/autofill_section_container.h"
 #include "chrome/browser/ui/autofill/mock_autofill_dialog_view_delegate.h"
@@ skipping 30 matching lines @@
 }
 
 TEST_F(AutofillDetailsContainerTest, ValidateAllSections) {
   using namespace autofill;
   using namespace testing;
 
   DetailOutputMap output;
   ValidityData validity;
 
   EXPECT_CALL(delegate_, InputsAreValid(_, _, VALIDATE_FINAL))
-      .Times(4)
-      .WillOnce(Return(validity))
+      .Times(3)
       .WillOnce(Return(validity))
       .WillOnce(Return(validity))
       .WillOnce(Return(validity));
 
   EXPECT_TRUE([container_ validate]);
 
   ValidityData invalid;
   invalid[ADDRESS_HOME_ZIP] = ASCIIToUTF16("Some error message");
 
   EXPECT_CALL(delegate_, InputsAreValid(_, _, VALIDATE_FINAL))
-      .Times(4)
+      .Times(3)
       .WillOnce(Return(validity))
       .WillOnce(Return(validity))
-      .WillOnce(Return(invalid))
-      .WillOnce(Return(validity));
+      .WillOnce(Return(invalid));
 
   EXPECT_FALSE([container_ validate]);
 }