Split to SafeBrowsingDatabaseManager into Local* and Remote*.

chrome/browser/safe_browsing/remote_database_manager.h

+// Copyright (c) 2015 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.
+//
+// Implementation of the SafeBrowsingDatabaseManager that sends URLs
+// via IPC to a database that chromium doesn't manage locally.
+
+#ifndef CHROME_BROWSER_SAFE_BROWSING_REMOTE_DATABASE_MANAGER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_REMOTE_DATABASE_MANAGER_H_
+
+#include <set>
+#include <string>
+#include <vector>
+
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "chrome/browser/safe_browsing/android_safe_browsing_api_handler.h"
+#include "chrome/browser/safe_browsing/database_manager.h"
+#include "url/gurl.h"
+
+// An implementation that proxies requests to a service outside of Chromium.
+// Does not manage a local database.
+class RemoteSafeBrowsingDatabaseManager
+      : public SafeBrowsingDatabaseManager {
+ public:
+  // Need to initialize before using.

[mattm, 2015/05/08 02:17:26]

nit: clarify comment & match style guide. maybe something like "Construct <foo>.
Must be initialized by calling <bar> before using."

[Nathan Parker, 2015/05/12 01:04:01]

Done.  Is there some other style violation here?

[mattm, 2015/05/12 07:00:40]

Ah, no. I just meant the comment style.

+  RemoteSafeBrowsingDatabaseManager();
+
+  //
+  // SafeBrowsingDatabaseManager implementation
+  //
+
+  bool CanCheckUrl(const GURL& url) const override;
+  bool download_protection_enabled() const override;
+  bool CheckBrowseUrl(const GURL& url, Client* client) override;
+  void CancelCheck(Client* client) override;
+  void StartOnIOThread() override;
+  void StopOnIOThread(bool shutdown) override;
+
+  // These will DCHECK fail with "not implemented".
+  // We may later add support for a subset of these.
+  bool CheckDownloadUrl(const std::vector<GURL>& url_chain,
+                        Client* client) override;
+  bool CheckExtensionIDs(const std::set<std::string>& extension_ids,
+                         Client* client) override;
+  bool MatchCsdWhitelistUrl(const GURL& url) override;
+  bool MatchMalwareIP(const std::string& ip_address) override;
+  bool MatchDownloadWhitelistUrl(const GURL& url) override;
+  bool MatchDownloadWhitelistString(const std::string& str) override;
+  bool MatchInclusionWhitelistUrl(const GURL& url) override;
+  bool IsMalwareKillSwitchOn() override;
+  bool IsCsdWhitelistKillSwitchOn() override;
+
+  //
+  // RemoteSafeBrowsingDatabaseManager implementation
+  //
+
+ private:
+  // Per-request tracker.
+  class ClientRequest {
+   public:
+    ClientRequest() : weak_factory_(this) {}
+    static void OnRequestDoneWeak(const base::WeakPtr<ClientRequest>& req,
+                                  SBThreatType matched_threat_type,
+                                  const std::string& metadata);
+    void OnRequestDone(SBThreatType matched_threat_type,
+                       const std::string& metadata);
+
+    Client* client_;
+    RemoteSafeBrowsingDatabaseManager* db_manager_;
+    GURL url_;
+    base::WeakPtrFactory<ClientRequest> weak_factory_;

[mattm, 2015/05/08 02:17:26]

I guess the members should also be private and have accessors.

[Nathan Parker, 2015/05/12 01:04:01]

Sure, done.  My theory was that since it's a private inner-class, the scope of
code that can access them is small and contained to the inner+outer class.  I
also moved the whole class to the .cc file.

+  };
+
+  ~RemoteSafeBrowsingDatabaseManager() override;
+
+  // Requests currently outstanding.  This owns the ptrs.
+  std::vector<ClientRequest*> current_requests_;
+  AndroidSafeBrowsingAPIHandler api_handler_;
+  bool enabled_;
+
+  friend class base::RefCountedThreadSafe<RemoteSafeBrowsingDatabaseManager>;
+  DISALLOW_COPY_AND_ASSIGN(RemoteSafeBrowsingDatabaseManager);
+};  // class RemoteSafeBrowsingDatabaseManager
+
+#endif  // CHROME_BROWSER_SAFE_BROWSING_REMOTE_DATABASE_MANAGER_H_