Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: chrome/browser/extensions/api/extension_action/script_badge_apitest.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
index f81f958555930622c2135f5cd7f122e956c35600..c30884d105b924ef6c2444de98f03b9a2ea5e688 100644
--- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc
@@ -19,7 +19,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
#include "net/dns/mock_host_resolver.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace extensions {
@@ -40,7 +40,7 @@ class ScriptBadgeApiTest : public ExtensionApiTest {
};
IN_PROC_BROWSER_TEST_F(ScriptBadgeApiTest, Basics) {
- ASSERT_TRUE(test_server()->Start());
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
ASSERT_TRUE(RunExtensionTest("script_badge/basics")) << message_;
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_;
@@ -88,8 +88,8 @@ IN_PROC_BROWSER_TEST_F(ScriptBadgeApiTest, Basics) {
ResultCatcher catcher;
// Visit a non-extension page so the extension can run a content script and
// cause the script badge to be animated in.
- ui_test_utils::NavigateToURL(browser(),
- test_server()->GetURL(std::string()));
+ ui_test_utils::NavigateToURL(
+ browser(), embedded_test_server()->GetURL("/title1.html"));
ASSERT_TRUE(catcher.GetNextResult());
}
EXPECT_TRUE(script_badge->GetIsVisible(tab_id));

Powered by Google App Engine
This is Rietveld 408576698