3 files changed, 1 insertions, 36 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index 112f3d1..dd353b0 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -412,15 +412,7 @@ void NavigateToFeedAndValidate(HTTPTestServer* server,
                                const std::string& expected_item_desc,
                                const std::string& expected_error) {
   if (sniff_xml_type) {
-    // Navigate to the feed will cause the extension to sniff the type and
-    // create an extra tab showing the feed preview.
-    ui_test_utils::NavigateToURL(browser, GetFeedUrl(server, url, false, ""));
-
-    // Validate that we have a new tab.
-    TabStripModel* tab_strip = browser->tabstrip_model();
-    if (tab_strip->count() == 1)
-      ui_test_utils::WaitForTabParented();
-    ASSERT_EQ(2, tab_strip->count());
+    // TODO(finnur): Implement this is a non-flaky way.
   }
 
   // There should be only one extension in the list (ours). Get its id.
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 4ea680f..285624f 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -260,26 +260,6 @@ class SimpleNotificationObserver : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(SimpleNotificationObserver);
 };
 
-class TabParentedNotificationObserver : public NotificationObserver {
- public:
-  TabParentedNotificationObserver() {
-    registrar_.Add(this, NotificationType::TAB_PARENTED,
-        NotificationService::AllSources());
-    ui_test_utils::RunMessageLoop();
-  }
-
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) {
-    MessageLoopForUI::current()->Quit();
-  }
-
- private:
-  NotificationRegistrar registrar_;
-
-  DISALLOW_COPY_AND_ASSIGN(TabParentedNotificationObserver);
-};
-
 class LanguageDetectionNotificationObserver : public NotificationObserver {
  public:
   explicit LanguageDetectionNotificationObserver(TabContents* tab) {
@@ -416,10 +396,6 @@ void WaitForNewTab(Browser* browser) {
       new_tab_observer(NotificationType::TAB_ADDED, browser);
 }
 
-void WaitForTabParented() {
-  TabParentedNotificationObserver new_tab_observer;
-}
-
 void WaitForBrowserActionUpdated(ExtensionAction* browser_action) {
   SimpleNotificationObserver<ExtensionAction>
       observer(NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index e466610..e164c34 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -65,9 +65,6 @@ void WaitForNavigations(NavigationController* controller,
 // Waits for a new tab to be added to |browser|.
 void WaitForNewTab(Browser* browser);
 
-// Waits for a tab to be parented.
-void WaitForTabParented();
-
 // Waits for a |browser_action| to be updated.
 void WaitForBrowserActionUpdated(ExtensionAction* browser_action);