Revert 66646 - Add "open as window" menu item to NTP app menu....

chrome/browser/extensions/extension_startup_browsertest.cc

 // Copyright (c) 2008 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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 66 matching lines @@
     EXPECT_TRUE(file_util::Delete(preferences_file_, false));
 
     // TODO(phajdan.jr): Check return values of the functions below, carefully.
     file_util::Delete(user_scripts_dir_, true);
     file_util::Delete(extensions_dir_, true);
   }
 
   void WaitForServicesToStart(int num_expected_extensions,
                               bool expect_extensions_enabled) {
     ExtensionsService* service = browser()->profile()->GetExtensionsService();
+    if (!service->is_ready())
+      ui_test_utils::WaitForNotification(NotificationType::EXTENSIONS_READY);
+    ASSERT_TRUE(service->is_ready());
 
     // Count the number of non-component extensions.
     int found_extensions = 0;
     for (size_t i = 0; i < service->extensions()->size(); i++)
       if (service->extensions()->at(i)->location() != Extension::COMPONENT)
         found_extensions++;
 
     ASSERT_EQ(static_cast<uint32>(num_expected_extensions),
               static_cast<uint32>(found_extensions));
     ASSERT_EQ(expect_extensions_enabled, service->extensions_enabled());
@@ skipping 97 matching lines @@
         .AppendASCII("Extensions")
         .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
         .AppendASCII("1.0.0.0");
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) {
   WaitForServicesToStart(1, false);
   TestInjection(true, true);
 }