Remove some dead and duplicate code that broke some jumbo builds

Some test code was compiled into chrome which in jumbo builds
broke the linking. In non-jumbo builds the code was probably
eliminated by the implicit dead-code-removal in the linker
(an .o file that is completely unused is ignored).

Also changing an #include "foo.cpp" to #include "foo.h" since that
caused similar linking errors related to duplicate code.

Change-Id: I6c39314fadc3a82f48135755cc7de1a540006ae5
Reviewed-on: https://chromium-review.googlesource.com/1213166Reviewed-by: James MacLean <wjmaclean@chromium.org>
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#589863}

chrome/browser/BUILD.gn

@@ -4997,6 +4997,7 @@ static_library("test_support") {
 
   public_deps = [
     ":browser",
+    "//chrome/browser/safe_browsing:test_support",
     "//chrome/browser/ui:test_support",
   ]
   deps = [

chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_browsertest.cc

@@ -10,7 +10,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/guest_view/browser/guest_view_manager.cc"
+#include "components/guest_view/browser/guest_view_manager.h"
+#include "components/guest_view/browser/guest_view_manager_delegate.h"
 #include "components/guest_view/browser/test_guest_view_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"

chrome/browser/safe_browsing/BUILD.gn

@@ -98,8 +98,6 @@ static_library("safe_browsing") {
       "services_delegate.h",
       "test_safe_browsing_blocking_page_quiet.cc",
       "test_safe_browsing_blocking_page_quiet.h",
-      "test_safe_browsing_service.cc",
-      "test_safe_browsing_service.h",
       "trigger_creator.cc",
       "trigger_creator.h",
       "ui_manager.cc",
@@ -255,3 +253,17 @@ static_library("advanced_protection") {
     "//content/public/browser:browser",
   ]
 }
+
+source_set("test_support") {
+  if (safe_browsing_mode != 0) {
+    sources = [
+      "test_safe_browsing_service.cc",
+      "test_safe_browsing_service.h",
+    ]
+
+    deps = [
+      "//chrome/common/safe_browsing:proto",
+      "//content/public/browser:browser",
+    ]
+  }
+}