Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

content/test/test_content_browser_client.h

Index: content/test/test_content_browser_client.h
===================================================================
--- content/test/test_content_browser_client.h	(revision 140381)
+++ content/test/test_content_browser_client.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
-#define CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
+#ifndef CONTENT_TEST_TEST_CONTENT_BROWSER_CLIENT_H_
+#define CONTENT_TEST_TEST_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
 #include <string>
@@ -15,11 +15,11 @@
 
 namespace content {
 
-// Base for unit tests that need to mock the ContentBrowserClient.
-class MockContentBrowserClient : public ContentBrowserClient {
+// Base for unit tests that need a ContentBrowserClient.
+class TestContentBrowserClient : public ContentBrowserClient {
  public:
-  MockContentBrowserClient();
-  virtual ~MockContentBrowserClient();
+  TestContentBrowserClient();
+  virtual ~TestContentBrowserClient();
 
   virtual WebContentsView* OverrideCreateWebContentsView(
       WebContents* web_contents,
@@ -30,9 +30,9 @@
   // Temporary directory for GetDefaultDownloadDirectory.
   ScopedTempDir download_dir_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockContentBrowserClient);
+  DISALLOW_COPY_AND_ASSIGN(TestContentBrowserClient);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
+#endif  // CONTENT_TEST_TEST_CONTENT_BROWSER_CLIENT_H_