Cope with a race condition in NetworkActionPredictor and NetworkActionPredictorDB initialization.

chrome/browser/autocomplete/autocomplete_browsertest.cc

 // 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.
 
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ skipping 48 matching lines @@
   LocationBar* GetLocationBar() const {
     return browser()->window()->GetLocationBar();
   }
 
   AutocompleteController* GetAutocompleteController() const {
     return GetLocationBar()->location_entry()->model()->popup_model()->
         autocomplete_controller();
   }
 };
 
-#if defined(OS_WIN) || defined(OS_LINUX)
-#define MAYBE_Basic FLAKY_Basic
-#else
-#define MAYBE_Basic Basic
-#endif
-IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Basic) {
+IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
   LocationBar* location_bar = GetLocationBar();
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL),
             location_bar->location_entry()->GetText());
   // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
   // platforms.
 
   location_bar->FocusLocation(true);
 
@@ skipping 235 matching lines @@
     const AutocompleteResult& result = autocomplete_controller->result();
     // 'App test' is also a substring of extension 'Packaged App Test'.
     EXPECT_GT(result.size(), 2U) << AutocompleteResultAsString(result);
     AutocompleteMatch match = result.match_at(0);
     EXPECT_EQ(ASCIIToUTF16("App Test"), match.contents);
     EXPECT_EQ(AutocompleteMatch::EXTENSION_APP, match.type);
     EXPECT_FALSE(match.deletable);
     location_bar->AcceptInput();
   }
 }