chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/extensions/active_script_controller_browsertest.cc ('k') | chrome/browser/extensions/api/context_menus/context_menu_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc

diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc

index 5236b966884b2ac30e632d17ac71bb0fd366a39e..0fdf5f303b82e9c2aad276bb8ac022c8ea3da195 100644

--- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc

+++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc

@@ -11,6 +11,7 @@

#include "chrome/common/extensions/api/cloud_print_private.h"

#include "components/cloud_devices/common/cloud_devices_switches.h"

#include "net/dns/mock_host_resolver.h"

+#include "net/test/embedded_test_server/embedded_test_server.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -26,7 +27,7 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest {

ExtensionApiTest::SetUpCommandLine(command_line);

command_line->AppendSwitchASCII(

switches::kCloudPrintURL,

- "http://www.cloudprintapp.com/files/extensions/api_test/"

+ "http://www.cloudprintapp.com/extensions/api_test/"

"cloud_print_private");

}

@@ -34,7 +35,7 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest {

// Start up the test server and get us ready for calling the install

// API functions.

host_resolver()->AddRule("www.cloudprintapp.com", "127.0.0.1");

- ASSERT_TRUE(test_server()->Start());

+ ASSERT_TRUE(embedded_test_server()->Start());

}

protected:

@@ -42,8 +43,8 @@ class ExtensionCloudPrintPrivateApiTest : public ExtensionApiTest {

// matches the cloud print app's extent that we set up via command line

// flags.

GURL GetTestServerURL(const std::string& path) {

- GURL url = test_server()->GetURL(

- "files/extensions/api_test/cloud_print_private/" + path);

+ GURL url = embedded_test_server()->GetURL(

+ "/extensions/api_test/cloud_print_private/" + path);

// Replace the host with 'www.cloudprintapp.com' so it matches the cloud

// print app's extent.