Changed some test code to avoid jumbo problems

In certain non-standard jumbo configurations (very large
jumbo units) there were some symbol clashes that do not
appear in normal jumbo builds. This resolves them by
renaming one test class to better match the test, and by
wrapping the other test in a custom namespace as done in other
places in blink tests.

Bug: 745732
Change-Id: Ic0388e9abd19b24366133c577059f59ef63a6b6b
Reviewed-on: https://chromium-review.googlesource.com/847009Reviewed-by: Fredrik Söderquist <fs@opera.com>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#526543}

third_party/WebKit/Source/core/exported/PrerenderingTest.cpp

@@ -60,10 +60,10 @@ WebURL ToWebURL(const char* url) {
   return WebURL(blink::URLTestHelpers::ToKURL(url));
 }
 
-class TestPrerendererClient : public WebPrerendererClient {
+class TestWebPrerendererClient : public WebPrerendererClient {
  public:
-  TestPrerendererClient() {}
-  virtual ~TestPrerendererClient() {}
+  TestWebPrerendererClient() {}
+  virtual ~TestWebPrerendererClient() {}
 
   void SetExtraDataForNextPrerender(WebPrerender::ExtraData* extra_data) {
     DCHECK(!extra_data_);
@@ -220,11 +220,11 @@ class PrerenderingTest : public ::testing::Test {
     return &prerendering_support_;
   }
 
-  TestPrerendererClient* PrerendererClient() { return &prerenderer_client_; }
+  TestWebPrerendererClient* PrerendererClient() { return &prerenderer_client_; }
 
  private:
   TestPrerenderingSupport prerendering_support_;
-  TestPrerendererClient prerenderer_client_;
+  TestWebPrerendererClient prerenderer_client_;
 
   FrameTestHelpers::WebViewHelper web_view_helper_;
 };

third_party/WebKit/Source/core/loader/resource/MultipartImageResourceParserTest.cpp

@@ -12,8 +12,7 @@
 #include <string.h>
 
 namespace blink {
-
-namespace {
+namespace multipart_image_resource_parser_test {
 
 String ToString(const Vector<char>& data) {
   if (data.IsEmpty())
@@ -415,6 +414,5 @@ TEST(MultipartResponseTest, EatLeadingCRLF) {
   EXPECT_EQ("", ToString(client->data_[3]));
 }
 
-}  // namespace
-
+}  // namespace multipart_image_resource_parser_test
 }  // namespace blink