Don't refer to test_runner from content/shell/browser/

The test_runner is part of content/shell/renderer. Move the shared
constant that the browser side wants to use out to
content/shell/common/web_test/web_test_constants. Because the
common/web_test code is a separate build target now, we can have the
test_runner and content_shell_lib both depend on it.

R=avi@chromium.org

Bug: 866140
Change-Id: Ifcc484108e2982284d78977a0c70f24565c7dc8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2132837Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755556}

content/shell/BUILD.gn

@@ -48,6 +48,7 @@ source_set("android_shell_descriptors") {
 source_set("web_test_common") {
   testonly = true
   sources = [
+    "common/web_test/web_test_constants.h",
     "common/web_test/web_test_string_util.cc",
     "common/web_test/web_test_string_util.h",
     "common/web_test/web_test_switches.cc",

content/shell/browser/web_test/web_test_client_impl.cc

@@ -24,7 +24,7 @@
 #include "content/shell/browser/web_test/web_test_content_browser_client.h"
 #include "content/shell/browser/web_test/web_test_content_index_provider.h"
 #include "content/shell/browser/web_test/web_test_permission_manager.h"
-#include "content/shell/test_runner/web_test_delegate.h"
+#include "content/shell/common/web_test/web_test_constants.h"
 #include "content/test/mock_platform_notification_service.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/self_owned_associated_receiver.h"
@@ -63,8 +63,8 @@ void SetDatabaseQuotaOnIOThread(
     scoped_refptr<storage::QuotaManager> quota_manager,
     int32_t quota) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DCHECK(quota >= 0 || quota == test_runner::kDefaultDatabaseQuota);
-  if (quota == test_runner::kDefaultDatabaseQuota) {
+  DCHECK(quota >= 0 || quota == kDefaultDatabaseQuota);
+  if (quota == kDefaultDatabaseQuota) {
     // Reset quota to settings with a zero refresh interval to force
     // QuotaManager to refresh settings immediately.
     storage::QuotaSettings default_settings;

content/shell/common/web_test/web_test_constants.h

+// Copyright 2013 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.
+
+#ifndef CONTENT_SHELL_COMMON_WEB_TEST_WEB_TEST_CONSTANTS_H_
+#define CONTENT_SHELL_COMMON_WEB_TEST_WEB_TEST_CONSTANTS_H_
+
+namespace content {
+
+constexpr int kDefaultDatabaseQuota = -1;
+
+}  // namespace content
+
+#endif  // CONTENT_SHELL_COMMON_WEB_TEST_WEB_TEST_CONSTANTS_H_

content/shell/test_runner/test_runner.cc

@@ -21,6 +21,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "cc/paint/paint_canvas.h"
+#include "content/shell/common/web_test/web_test_constants.h"
 #include "content/shell/common/web_test/web_test_string_util.h"
 #include "content/shell/test_runner/layout_dump.h"
 #include "content/shell/test_runner/mock_content_settings_client.h"
@@ -1537,7 +1538,7 @@ void TestRunner::Reset() {
 
   if (delegate_) {
     // Reset the default quota for each origin.
-    delegate_->SetDatabaseQuota(kDefaultDatabaseQuota);
+    delegate_->SetDatabaseQuota(content::kDefaultDatabaseQuota);
     delegate_->SetDeviceColorSpace("reset");
     delegate_->SetDeviceScaleFactor(GetDefaultDeviceScaleFactor());
     delegate_->SetBlockThirdPartyCookies(false);

content/shell/test_runner/web_test_delegate.h

@@ -40,8 +40,6 @@ namespace test_runner {
 class WebWidgetTestProxy;
 struct TestPreferences;
 
-constexpr int kDefaultDatabaseQuota = -1;
-
 class WebTestDelegate {
  public:
   virtual ~WebTestDelegate() = default;