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

Side by Side Diff: chrome_frame/test/http_server.cc

Issue 345032: Updates CFInstall.js to:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/test/data/chrome_frame_tester_helpers.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "chrome_frame/test/http_server.h" 4 #include "chrome_frame/test/http_server.h"
5 5
6 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data"; 6 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
7 7
8 void ChromeFrameHTTPServer::SetUp() { 8 void ChromeFrameHTTPServer::SetUp() {
9 std::wstring document_root(kDocRoot); 9 std::wstring document_root(kDocRoot);
10 server_ = HTTPTestServer::CreateServer(document_root, NULL, 30, 1000); 10 server_ = HTTPTestServer::CreateServer(document_root, NULL, 30, 1000);
11 ASSERT_TRUE(server_ != NULL); 11 ASSERT_TRUE(server_ != NULL);
12 12
13 // copy CFInstance.js into the test directory 13 // copy CFInstance.js into the test directory
14 FilePath cf_source_path; 14 FilePath cf_source_path;
15 PathService::Get(base::DIR_SOURCE_ROOT, &cf_source_path); 15 PathService::Get(base::DIR_SOURCE_ROOT, &cf_source_path);
16 cf_source_path = cf_source_path.Append(FILE_PATH_LITERAL("chrome_frame")); 16 cf_source_path = cf_source_path.Append(FILE_PATH_LITERAL("chrome_frame"));
17 17
18 file_util::CopyFile(cf_source_path.Append(FILE_PATH_LITERAL("CFInstance.js")), 18 file_util::CopyFile(cf_source_path.Append(FILE_PATH_LITERAL("CFInstance.js")),
19 cf_source_path.Append( 19 cf_source_path.Append(
20 FILE_PATH_LITERAL("test")).Append( 20 FILE_PATH_LITERAL("test")).Append(
21 FILE_PATH_LITERAL("data")).Append( 21 FILE_PATH_LITERAL("data")).Append(
22 FILE_PATH_LITERAL("CFInstance.js"))); // NOLINT 22 FILE_PATH_LITERAL("CFInstance.js"))); // NOLINT
23
24 file_util::CopyFile(cf_source_path.Append(FILE_PATH_LITERAL("CFInstall.js")),
25 cf_source_path.Append(
26 FILE_PATH_LITERAL("test")).Append(
27 FILE_PATH_LITERAL("data")).Append(
28 FILE_PATH_LITERAL("CFInstall.js"))); // NOLINT
23 } 29 }
24 30
25 void ChromeFrameHTTPServer::TearDown() { 31 void ChromeFrameHTTPServer::TearDown() {
26 if (server_) { 32 if (server_) {
27 server_ = NULL; 33 server_ = NULL;
28 } 34 }
29 35
30 // clobber CFInstance.js 36 // clobber CFInstance.js
31 FilePath cfi_path; 37 FilePath cfi_path;
32 PathService::Get(base::DIR_SOURCE_ROOT, &cfi_path); 38 PathService::Get(base::DIR_SOURCE_ROOT, &cfi_path);
33 cfi_path = cfi_path 39 cfi_path = cfi_path
34 .Append(FILE_PATH_LITERAL("chrome_frame")) 40 .Append(FILE_PATH_LITERAL("chrome_frame"))
35 .Append(FILE_PATH_LITERAL("test")) 41 .Append(FILE_PATH_LITERAL("test"))
36 .Append(FILE_PATH_LITERAL("data")) 42 .Append(FILE_PATH_LITERAL("data"))
37 .Append(FILE_PATH_LITERAL("CFInstance.js")); 43 .Append(FILE_PATH_LITERAL("CFInstance.js"));
38 44
39 file_util::Delete(cfi_path, false); 45 file_util::Delete(cfi_path, false);
46
47 cfi_path.empty();
48 PathService::Get(base::DIR_SOURCE_ROOT, &cfi_path);
49 cfi_path = cfi_path
50 .Append(FILE_PATH_LITERAL("chrome_frame"))
51 .Append(FILE_PATH_LITERAL("test"))
52 .Append(FILE_PATH_LITERAL("data"))
53 .Append(FILE_PATH_LITERAL("CFInstall.js"));
54
55 file_util::Delete(cfi_path, false);
40 } 56 }
41 57
42 bool ChromeFrameHTTPServer::WaitToFinish(int milliseconds) { 58 bool ChromeFrameHTTPServer::WaitToFinish(int milliseconds) {
43 if (!server_) 59 if (!server_)
44 return true; 60 return true;
45 61
46 return server_->WaitToFinish(milliseconds); 62 return server_->WaitToFinish(milliseconds);
47 } 63 }
48 64
49 GURL ChromeFrameHTTPServer::Resolve(const wchar_t* relative_url) { 65 GURL ChromeFrameHTTPServer::Resolve(const wchar_t* relative_url) {
50 return server_->TestServerPageW(relative_url); 66 return server_->TestServerPageW(relative_url);
51 } 67 }
52 68
53 std::wstring ChromeFrameHTTPServer::GetDataDir() { 69 std::wstring ChromeFrameHTTPServer::GetDataDir() {
54 return server_->GetDataDirectory().ToWStringHack(); 70 return server_->GetDataDirectory().ToWStringHack();
55 } 71 }
56 72
OLDNEW
« no previous file with comments | « chrome_frame/test/data/chrome_frame_tester_helpers.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698