Fix newly introduced flake in ExtensionPreferenceApiTest.Standard

chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/extensions/api/autofill_private/autofill_private_event_router.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 33 matching lines @@
 
 AutofillPrivateEventRouter::~AutofillPrivateEventRouter() {
 }
 
 void AutofillPrivateEventRouter::Shutdown() {
   if (personal_data_)
     personal_data_->RemoveObserver(this);
 }
 
 void AutofillPrivateEventRouter::OnPersonalDataChanged() {
-  DCHECK(personal_data_ && personal_data_->IsDataLoaded());
+  DCHECK(personal_data_);

[stevenjb, 2016/06/08 00:25:53]

Looking at personal_data_manager.cc, it is not clear to me that this is
guaranteed to be true. I think it would be better to early exit if null.

[hcarmona, 2016/06/08 14:21:06]

Done.

+
+  // Ignore any updates before data is loaded. This can happen in tests.
+  if (!personal_data_->IsDataLoaded())
+    return;
 
   autofill_util::AddressEntryList addressList =
       extensions::autofill_util::GenerateAddressList(*personal_data_);
   std::unique_ptr<base::ListValue> args(
       api::autofill_private::OnAddressListChanged::Create(addressList)
           .release());
   std::unique_ptr<Event> extension_event(
       new Event(events::AUTOFILL_PRIVATE_ON_ADDRESS_LIST_CHANGED,
                 api::autofill_private::OnAddressListChanged::kEventName,
                 std::move(args)));
@@ skipping 10 matching lines @@
                 std::move(args)));
   event_router_->BroadcastEvent(std::move(extension_event));
 }
 
 AutofillPrivateEventRouter* AutofillPrivateEventRouter::Create(
     content::BrowserContext* context) {
   return new AutofillPrivateEventRouter(context);
 }
 
 }  // namespace extensions