Revert of Remove race in DeclarativeContentApiTest.RulesPersistence test

chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc

 // Copyright (c) 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.
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
@@ skipping 467 matching lines @@
   ASSERT_TRUE(extension);
   ASSERT_TRUE(ready.WaitUntilSatisfied());
 
   CreateIncognitoBrowser();
   ASSERT_TRUE(ready_split.WaitUntilSatisfied());
 }
 
 // Reloads the extension from PRE_RulesPersistence and checks that the rules
 // continue to work as expected after being persisted and reloaded.
 IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest, RulesPersistence) {
+  ExtensionTestMessageListener ready("second run ready", false);
+  ExtensionTestMessageListener ready_split("second run ready (split)", false);
+  ASSERT_TRUE(ready.WaitUntilSatisfied());
+
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
-  const base::FilePath path = test_data_dir_.
-      AppendASCII("declarative_content").AppendASCII("persistence");
   const Extension* extension =
-      GetExtensionByPath(registry->enabled_extensions(), path);
-
-  if (!extension) {
-    ExtensionTestMessageListener ready("second run ready", false);
-    ASSERT_TRUE(ready.WaitUntilSatisfied());
-    extension = GetExtensionByPath(registry->enabled_extensions(), path);
-  }
+      GetExtensionByPath(registry->enabled_extensions(),
+                         test_data_dir_.AppendASCII("declarative_content")
+                         .AppendASCII("persistence"));
 
   // Check non-incognito browser.
   content::WebContents* const tab =
       browser()->tab_strip_model()->GetWebContentsAt(0);
   const int tab_id = ExtensionTabUtil::GetTabId(tab);
 
   const ExtensionAction* page_action =
       ExtensionActionManager::Get(browser()->profile())->
       GetPageAction(*extension);
   ASSERT_TRUE(page_action);
   EXPECT_FALSE(page_action->GetIsVisible(tab_id));
 
   NavigateInRenderer(tab, GURL("http://test_normal/"));
   EXPECT_TRUE(page_action->GetIsVisible(tab_id));
 
   NavigateInRenderer(tab, GURL("http://test_split/"));
   EXPECT_FALSE(page_action->GetIsVisible(tab_id));
 
   // Check incognito browser.
-  ExtensionTestMessageListener ready_split("second run ready (split)", false);
   Browser* incognito_browser = CreateIncognitoBrowser();
   ASSERT_TRUE(ready_split.WaitUntilSatisfied());
   content::WebContents* const incognito_tab =
       incognito_browser->tab_strip_model()->GetWebContentsAt(0);
   const int incognito_tab_id = ExtensionTabUtil::GetTabId(incognito_tab);
 
   const ExtensionAction* incognito_page_action =
       ExtensionActionManager::Get(incognito_browser->profile())->
       GetPageAction(*extension);
   ASSERT_TRUE(incognito_page_action);
@@ skipping 279 matching lines @@
 // consistent URL state for all conditions. i.e.: if condition1 evaluates to
 // false on url0 and true on url1, and condition2 evaluates to true on url0 and
 // false on url1, navigate from url0 to url1 and validate that no action is
 // triggered. Do the same when navigating back to url0. This kind of test is
 // unfortunately not feasible with the current implementation and the existing
 // supported conditions and actions.
 
 }  // namespace
 }  // namespace extensions