summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-19 00:25:23 +0000
committerpaul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-19 00:25:23 +0000
commit51065cbfb4e2a6cfa175cce600c8494cac343e87 (patch)
tree74a00ba2749d2944997f0f6a0e305f590a412751
parentc0595460c7070a7c7b83bebb9c47b6e3aa540c25 (diff)
downloadchromium_src-51065cbfb4e2a6cfa175cce600c8494cac343e87.zip
chromium_src-51065cbfb4e2a6cfa175cce600c8494cac343e87.tar.gz
chromium_src-51065cbfb4e2a6cfa175cce600c8494cac343e87.tar.bz2
Bring the SafeBrowsingProtocolManager out of scaffolding.
Review URL: http://codereview.chromium.org/20480 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9996 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_service.cc8
-rw-r--r--chrome/common/temp_scaffolding_stubs.h25
2 files changed, 1 insertions, 32 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index bb281b3..b524f22 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/profile_manager.h"
+#include "chrome/browser/safe_browsing/protocol_manager.h"
#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
#include "chrome/browser/safe_browsing/safe_browsing_database.h"
#include "chrome/browser/tab_contents/tab_util.h"
@@ -24,13 +25,6 @@
#include "chrome/common/pref_service.h"
#include "net/base/registry_controlled_domain.h"
-#if defined(OS_WIN)
-// TODO(port): Place this header above once we've ported protocol_manager.*
-#include "chrome/browser/safe_browsing/protocol_manager.h"
-#elif defined(OS_POSIX)
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
using base::Time;
using base::TimeDelta;
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index e7f07be..4ed4bb0 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -243,31 +243,6 @@ class PrintJobManager {
} // namespace printing
-class SafeBrowsingProtocolManager {
- public:
- SafeBrowsingProtocolManager(SafeBrowsingService* service,
- MessageLoop* notify_loop,
- const std::string& client_key,
- const std::string& wrapped_key) {
- NOTIMPLEMENTED();
- }
-
- ~SafeBrowsingProtocolManager() { NOTIMPLEMENTED(); }
- void OnChunkInserted() { NOTIMPLEMENTED(); }
- void OnGetChunksComplete(const std::vector<SBListChunkRanges>& list,
- bool database_error) {
- NOTIMPLEMENTED();
- }
- void Initialize() { NOTIMPLEMENTED(); }
- base::Time last_update() const { return last_update_; }
- void GetFullHash(SafeBrowsingService::SafeBrowsingCheck* check,
- const std::vector<SBPrefix>& prefixes) {
- NOTIMPLEMENTED();
- }
- private:
- base::Time last_update_;
-};
-
struct DownloadBuffer {
Lock lock;
typedef std::pair<net::IOBuffer*, int> Contents;