Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

components/test_runner/test_common.cc

 // Copyright 2014 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 "components/test_runner/test_common.h"
 
 #include <stddef.h>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/web/WebKit.h"
-#include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 
 namespace test_runner {
 
 namespace {
 
 const char layout_tests_pattern[] = "/LayoutTests/";
 const std::string::size_type layout_tests_pattern_size =
     sizeof(layout_tests_pattern) - 1;
 const char file_url_pattern[] = "file:/";
 const char file_test_prefix[] = "(file test):";
@@ skipping 13 matching lines @@
                                   const char* name) override {}
   void unregisterMemoryDumpProvider(blink::WebMemoryDumpProvider*) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockBlinkPlatform);
 };
 
 base::LazyInstance<MockBlinkPlatform>::Leaky g_mock_blink_platform =
     LAZY_INSTANCE_INITIALIZER;
 
-const char* kIllegalString = "illegal value";
-const char* kPolicyIgnore = "Ignore";
-const char* kPolicyDownload = "download";
-const char* kPolicyCurrentTab = "current tab";
-const char* kPolicyNewBackgroundTab = "new background tab";
-const char* kPolicyNewForegroundTab = "new foreground tab";
-const char* kPolicyNewWindow = "new window";
-const char* kPolicyNewPopup = "new popup";
-
 }  // namespace
 
 std::string NormalizeLayoutTestURL(const std::string& url) {
   std::string result = url;
   size_t pos;
   if (!url.find(file_url_pattern) &&
       ((pos = url.find(layout_tests_pattern)) != std::string::npos)) {
     // adjust file URLs to match upstream results.
     result.replace(0, pos + layout_tests_pattern_size, file_test_prefix);
   } else if (!url.find(data_url_pattern)) {
     // URL-escape data URLs to match results upstream.
     std::string path = url.substr(data_url_pattern_size);
     result.replace(data_url_pattern_size, url.length(), path);
   }
   return result;
 }
 
-std::string URLDescription(const GURL& url) {
-  if (url.SchemeIs(url::kFileScheme))
-    return url.ExtractFileName();
-  return url.possibly_invalid_spec();
-}
-
-const char* WebNavigationPolicyToString(
-    const blink::WebNavigationPolicy& policy) {
-  switch (policy) {
-    case blink::WebNavigationPolicyIgnore:
-      return kPolicyIgnore;
-    case blink::WebNavigationPolicyDownload:
-      return kPolicyDownload;
-    case blink::WebNavigationPolicyCurrentTab:
-      return kPolicyCurrentTab;
-    case blink::WebNavigationPolicyNewBackgroundTab:
-      return kPolicyNewBackgroundTab;
-    case blink::WebNavigationPolicyNewForegroundTab:
-      return kPolicyNewForegroundTab;
-    case blink::WebNavigationPolicyNewWindow:
-      return kPolicyNewWindow;
-    case blink::WebNavigationPolicyNewPopup:
-      return kPolicyNewPopup;
-    default:
-      return kIllegalString;
-  }
-}
-
 void EnsureBlinkInitialized() {
   g_mock_blink_platform.Get();
 }
 
 }  // namespace test_runner