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

Unified Diff: chrome/browser/safe_browsing/local_safebrowsing_test_server.cc

Issue 10905087: Revert 154861 - Run safebrowsing_service_test through the net testserver code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/safe_browsing/local_safebrowsing_test_server.cc
===================================================================
--- chrome/browser/safe_browsing/local_safebrowsing_test_server.cc (revision 154874)
+++ chrome/browser/safe_browsing/local_safebrowsing_test_server.cc (working copy)
@@ -1,61 +0,0 @@
-// Copyright (c) 2012 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 "chrome/browser/safe_browsing/local_safebrowsing_test_server.h"
-
-#include "base/command_line.h"
-#include "base/path_service.h"
-#include "base/string_number_conversions.h"
-#include "base/values.h"
-#include "net/test/python_utils.h"
-#include "net/test/test_server.h"
-
-LocalSafeBrowsingTestServer::LocalSafeBrowsingTestServer(
- const FilePath& data_file)
- : net::LocalTestServer(net::TestServer::TYPE_HTTP,
- net::TestServer::kLocalhost,
- FilePath()),
- data_file_(data_file) {
-}
-
-LocalSafeBrowsingTestServer::~LocalSafeBrowsingTestServer() {}
-
-bool LocalSafeBrowsingTestServer::GetTestServerPath(
- FilePath* testserver_path) const {
- FilePath testserver_dir;
- if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
- LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
- return false;
- }
-
- testserver_dir = testserver_dir
- .Append(FILE_PATH_LITERAL("chrome"))
- .Append(FILE_PATH_LITERAL("browser"))
- .Append(FILE_PATH_LITERAL("safe_browsing"));
-
- *testserver_path = testserver_dir.Append(FILE_PATH_LITERAL(
- "safe_browsing_testserver.py"));
- return true;
-}
-
-bool LocalSafeBrowsingTestServer::SetPythonPath() const {
- if (!net::LocalTestServer::SetPythonPath())
- return false;
-
- // Locate the Python code generated by the protocol buffers compiler.
- FilePath pyproto_dir;
- if (!GetPyProtoPath(&pyproto_dir)) {
- LOG(ERROR) << "Cannot find pyproto dir for generated code.";
- return false;
- }
-
- AppendToPythonPath(pyproto_dir.AppendASCII("google"));
- return true;
-}
-
-bool LocalSafeBrowsingTestServer::GenerateAdditionalArguments(
- base::DictionaryValue* arguments) const {
- arguments->SetString("data-file", data_file_.value());
- return true;
-}
« no previous file with comments | « chrome/browser/safe_browsing/local_safebrowsing_test_server.h ('k') | chrome/browser/safe_browsing/safe_browsing_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698