Split to SafeBrowsingDatabaseManager into Local* and Remote*.

chrome/browser/renderer_host/safe_browsing_resource_throttle.cc

 // 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/renderer_host/safe_browsing_resource_throttle.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
@@ skipping 73 matching lines @@
 // the URL has been classified.
 void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
     const GURL& url,
     SBThreatType threat_type,
     const std::string& metadata) {
   CHECK(state_ == STATE_CHECKING_URL);
   CHECK(defer_state_ != DEFERRED_NONE);
   CHECK(url == url_being_checked_) << "Was expecting: " << url_being_checked_
                                    << " but got: " << url;
 
-#if defined(OS_ANDROID)
-  // Temporarily disable SB interstitial during Finch experiment.
-  // The database check is still exercised, but the interstitial never shown.
-  threat_type = SB_THREAT_TYPE_SAFE;
-#endif

[Nico, 2015/05/13 00:07:23]

Same question

[Nathan Parker, 2015/05/13 00:11:23]

Acknowledged.

-
   timer_.Stop();  // Cancel the timeout timer.
   threat_type_ = threat_type;
   state_ = STATE_NONE;
 
   if (threat_type == SB_THREAT_TYPE_SAFE) {
     // Log how much time the safe browsing check cost us.
     ui_manager_->LogPauseDelay(base::TimeTicks::Now() - url_check_start_time_);
 
     // Continue the request.
     ResumeRequest();
@@ skipping 114 matching lines @@
       url_being_checked_, SB_THREAT_TYPE_SAFE, std::string());
 }
 
 void SafeBrowsingResourceThrottle::ResumeRequest() {
   CHECK(state_ == STATE_NONE);
   CHECK(defer_state_ != DEFERRED_NONE);
 
   defer_state_ = DEFERRED_NONE;
   controller()->Resume();
 }