chrome_frame/test/test_with_web_server.h - Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories

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_frame/test/test_with_web_server.h

Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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_frame/test/test_with_web_server.h

diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h

index fe03b0fcf38f7beafe5488524d6bc98ab5f935d7..e42eedf00ca89ca6fe32bbab1e1087b2358f4a1e 100644

--- a/chrome_frame/test/test_with_web_server.h

+++ b/chrome_frame/test/test_with_web_server.h

@@ -78,7 +78,7 @@ class WebServerListener {

// "<body>Rendered in CF.</body></html>", 4, 1000));

class MockWebServer : public test_server::HTTPTestServer {

public:

- MockWebServer(int port, const std::wstring& address, FilePath root_dir)

+ MockWebServer(int port, const std::wstring& address, base::FilePath root_dir)

: test_server::HTTPTestServer(port, address, root_dir), listener_(NULL) {}

// Overriden from test_server::HTTPTestServer.

@@ -206,7 +206,7 @@ class ChromeFrameTestWithWebServer : public testing::Test {

// Ensures (well, at least tries to ensure) that the browser window has focus.

bool BringBrowserToTop();

- const FilePath& GetCFTestFilePath() {

+ const base::FilePath& GetCFTestFilePath() {

return test_file_path_;

}

@@ -225,17 +225,17 @@ class ChromeFrameTestWithWebServer : public testing::Test {

static void SetUpTestCase();

static void TearDownTestCase();

- static const FilePath& GetChromeUserDataDirectory();

+ static const base::FilePath& GetChromeUserDataDirectory();

virtual void SetUp() OVERRIDE;

virtual void TearDown() OVERRIDE;

// The on-disk path to our html test files.

- static FilePath test_file_path_;

- static FilePath results_dir_;

- static FilePath CFInstall_path_;

- static FilePath CFInstance_path_;

- static FilePath chrome_user_data_dir_;

+ static base::FilePath test_file_path_;

+ static base::FilePath results_dir_;

+ static base::FilePath CFInstall_path_;

+ static base::FilePath CFInstance_path_;

+ static base::FilePath chrome_user_data_dir_;

// The user data directory used for Chrome instances.

static base::ScopedTempDir temp_dir_;

@@ -264,7 +264,7 @@ class SimpleWebServerTest {

template <class ResponseClass>

void PopulateStaticFileListT(const wchar_t* pages[], int count,

- const FilePath& directory) {

+ const base::FilePath& directory) {

for (int i = 0; i < count; ++i) {

server_.AddResponse(new ResponseClass(

base::StringPrintf("/%ls", pages[i]).c_str(),

« no previous file with comments | « chrome_frame/test/test_server_test.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »