Rename proxy_resolver_mojo* files to proxy_resolver_factory_mojo*.

This reflects the class name being exposed in the header (which is a factory).

BUG=467403

Review URL: https://codereview.chromium.org/1153063004

Cr-Commit-Position: refs/heads/master@{#332243}

7 files changed, 49 insertions, 46 deletions

diff --git a/net/BUILD.gn b/net/BUILD.gn
index 85cfe20..4e86afb 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -792,8 +792,8 @@ if (use_v8_in_net && !is_android) {
       "proxy/in_process_mojo_proxy_resolver_factory.cc",
       "proxy/in_process_mojo_proxy_resolver_factory.h",
       "proxy/mojo_proxy_resolver_factory.h",
-      "proxy/proxy_resolver_mojo.cc",
-      "proxy/proxy_resolver_mojo.h",
+      "proxy/proxy_resolver_factory_mojo.cc",
+      "proxy/proxy_resolver_factory_mojo.h",
       "proxy/proxy_service_mojo.cc",
       "proxy/proxy_service_mojo.h",
     ]
@@ -1496,7 +1496,7 @@ if (!is_android && !is_mac) {
         "proxy/mojo_proxy_resolver_factory_impl_unittest.cc",
         "proxy/mojo_proxy_resolver_impl_unittest.cc",
         "proxy/proxy_resolver_error_observer_mojo_unittest.cc",
-        "proxy/proxy_resolver_mojo_unittest.cc",
+        "proxy/proxy_resolver_factory_mojo_unittest.cc",
         "proxy/proxy_service_mojo_unittest.cc",
       ]
     }
diff --git a/net/net.gyp b/net/net.gyp
index 9c2b9e0..7236c26 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -322,7 +322,7 @@
               'proxy/mojo_proxy_resolver_factory_impl_unittest.cc',
               'proxy/mojo_proxy_resolver_impl_unittest.cc',
               'proxy/proxy_resolver_error_observer_mojo_unittest.cc',
-              'proxy/proxy_resolver_mojo_unittest.cc',
+              'proxy/proxy_resolver_factory_mojo_unittest.cc',
               'proxy/proxy_service_mojo_unittest.cc',
             ],
           },
@@ -894,8 +894,8 @@
             'proxy/in_process_mojo_proxy_resolver_factory.cc',
             'proxy/in_process_mojo_proxy_resolver_factory.h',
             'proxy/mojo_proxy_resolver_factory.h',
-            'proxy/proxy_resolver_mojo.cc',
-            'proxy/proxy_resolver_mojo.h',
+            'proxy/proxy_resolver_factory_mojo.cc',
+            'proxy/proxy_resolver_factory_mojo.h',
             'proxy/proxy_service_mojo.cc',
             'proxy/proxy_service_mojo.h',
           ],
diff --git a/net/net.gypi b/net/net.gypi
index ebdb3fc..ae72e2d 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -1485,7 +1485,7 @@
       'proxy/proxy_info_unittest.cc',
       'proxy/proxy_list_unittest.cc',
       'proxy/proxy_resolver_error_observer_mojo_unittest.cc',
-      'proxy/proxy_resolver_mojo_unittest.cc',
+      'proxy/proxy_resolver_factory_mojo_unittest.cc',
       'proxy/proxy_resolver_v8_tracing_unittest.cc',
       'proxy/proxy_resolver_v8_unittest.cc',
       'proxy/proxy_script_decider_unittest.cc',
diff --git a/net/proxy/proxy_resolver_mojo.cc b/net/proxy/proxy_resolver_factory_mojo.cc
index 8512682..695c64b 100644
--- a/net/proxy/proxy_resolver_mojo.cc
+++ b/net/proxy/proxy_resolver_factory_mojo.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/proxy/proxy_resolver_mojo.h"
+#include "net/proxy/proxy_resolver_factory_mojo.h"
 
 #include <set>
 
diff --git a/net/proxy/proxy_resolver_mojo.h b/net/proxy/proxy_resolver_factory_mojo.h
index 7c82746..8d12e5b 100644
--- a/net/proxy/proxy_resolver_mojo.h
+++ b/net/proxy/proxy_resolver_factory_mojo.h
@@ -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 NET_PROXY_PROXY_RESOLVER_MOJO_H_
-#define NET_PROXY_PROXY_RESOLVER_MOJO_H_
+#ifndef NET_PROXY_PROXY_RESOLVER_FACTORY_MOJO_H_
+#define NET_PROXY_PROXY_RESOLVER_FACTORY_MOJO_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -48,4 +48,4 @@ class ProxyResolverFactoryMojo : public ProxyResolverFactory {
 
 }  // namespace net
 
-#endif  // NET_PROXY_PROXY_RESOLVER_MOJO_H_
+#endif  // NET_PROXY_PROXY_RESOLVER_FACTORY_MOJO_H_
diff --git a/net/proxy/proxy_resolver_mojo_unittest.cc b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
index dd62518..c5c8247 100644
--- a/net/proxy/proxy_resolver_mojo_unittest.cc
+++ b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/proxy/proxy_resolver_mojo.h"
+#include "net/proxy/proxy_resolver_factory_mojo.h"
 
 #include <list>
 #include <map>
@@ -408,8 +408,8 @@ void MockMojoProxyResolverFactory::CreateResolver(
 
 }  // namespace
 
-class ProxyResolverMojoTest : public testing::Test,
-                              public MojoProxyResolverFactory {
+class ProxyResolverFactoryMojoTest : public testing::Test,
+                                     public MojoProxyResolverFactory {
  public:
   void SetUp() override {
     mock_proxy_resolver_factory_.reset(new MockMojoProxyResolverFactory(
@@ -474,11 +474,11 @@ class ProxyResolverMojoTest : public testing::Test,
   TestClosure on_delete_callback_;
 };
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver) {
   CreateProxyResolver();
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Empty) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_Empty) {
   TestCompletionCallback callback;
   scoped_refptr<ProxyResolverScriptData> pac_script(
       ProxyResolverScriptData::FromUTF8(""));
@@ -490,7 +490,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Empty) {
   EXPECT_FALSE(request);
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Url) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_Url) {
   TestCompletionCallback callback;
   scoped_refptr<ProxyResolverScriptData> pac_script(
       ProxyResolverScriptData::FromURL(GURL(kExampleUrl)));
@@ -502,7 +502,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Url) {
   EXPECT_FALSE(request);
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Failed) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_Failed) {
   mock_proxy_resolver_factory_->AddCreateProxyResolverAction(
       CreateProxyResolverAction::ReturnResult(kScriptData,
                                               ERR_PAC_STATUS_NOT_OK));
@@ -522,7 +522,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Failed) {
   CreateProxyResolver();
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_BothDisconnected) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_BothDisconnected) {
   mock_proxy_resolver_factory_->AddCreateProxyResolverAction(
       CreateProxyResolverAction::DropBoth(kScriptData));
 
@@ -537,7 +537,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_BothDisconnected) {
   EXPECT_TRUE(request);
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_ClientDisconnected) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_ClientDisconnected) {
   mock_proxy_resolver_factory_->AddCreateProxyResolverAction(
       CreateProxyResolverAction::DropClient(kScriptData));
 
@@ -552,7 +552,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_ClientDisconnected) {
   EXPECT_TRUE(request);
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_ResolverDisconnected) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_ResolverDisconnected) {
   mock_proxy_resolver_factory_->AddCreateProxyResolverAction(
       CreateProxyResolverAction::DropResolver(kScriptData));
 
@@ -568,7 +568,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_ResolverDisconnected) {
   on_delete_callback_.WaitForResult();
 }
 
-TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Cancel) {
+TEST_F(ProxyResolverFactoryMojoTest, CreateProxyResolver_Cancel) {
   mock_proxy_resolver_factory_->AddCreateProxyResolverAction(
       CreateProxyResolverAction::WaitForClientDisconnect(kScriptData));
 
@@ -587,7 +587,7 @@ TEST_F(ProxyResolverMojoTest, CreateProxyResolver_Cancel) {
   on_delete_callback_.WaitForResult();
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL) {
   mock_proxy_resolver_.AddGetProxyAction(GetProxyForUrlAction::ReturnServers(
       GURL(kExampleUrl), ProxyServersFromPacString("DIRECT")));
   CreateProxyResolver();
@@ -599,7 +599,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL) {
   EXPECT_EQ("DIRECT", request->results().ToPacString());
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_LoadState) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_LoadState) {
   mock_proxy_resolver_.AddGetProxyAction(
       GetProxyForUrlAction::SendLoadStateChanged(GURL(kExampleUrl)));
   CreateProxyResolver();
@@ -614,7 +614,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_LoadState) {
   EXPECT_EQ(ERR_PAC_SCRIPT_TERMINATED, request->WaitForResult());
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_MultipleResults) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_MultipleResults) {
   static const char kPacString[] =
       "PROXY foo1:80;DIRECT;SOCKS foo2:1234;"
       "SOCKS5 foo3:1080;HTTPS foo4:443;QUIC foo6:8888";
@@ -629,7 +629,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_MultipleResults) {
   EXPECT_EQ(kPacString, request->results().ToPacString());
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_Error) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_Error) {
   mock_proxy_resolver_.AddGetProxyAction(
       GetProxyForUrlAction::ReturnError(GURL(kExampleUrl), ERR_UNEXPECTED));
   CreateProxyResolver();
@@ -641,7 +641,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_Error) {
   EXPECT_TRUE(request->results().is_empty());
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_Cancel) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_Cancel) {
   mock_proxy_resolver_.AddGetProxyAction(
       GetProxyForUrlAction::WaitForClientDisconnect(GURL(kExampleUrl)));
   CreateProxyResolver();
@@ -654,7 +654,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_Cancel) {
   mock_proxy_resolver_.WaitForNextRequest();
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_MultipleRequests) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_MultipleRequests) {
   mock_proxy_resolver_.AddGetProxyAction(GetProxyForUrlAction::ReturnServers(
       GURL(kExampleUrl), ProxyServersFromPacString("DIRECT")));
   mock_proxy_resolver_.AddGetProxyAction(GetProxyForUrlAction::ReturnServers(
@@ -674,7 +674,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_MultipleRequests) {
   EXPECT_EQ("HTTPS foo:443", request2->results().ToPacString());
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_Disconnect) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_Disconnect) {
   mock_proxy_resolver_.AddGetProxyAction(
       GetProxyForUrlAction::Disconnect(GURL(kExampleUrl)));
   CreateProxyResolver();
@@ -692,7 +692,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_Disconnect) {
   }
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_ClientClosed) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_ClientClosed) {
   mock_proxy_resolver_.AddGetProxyAction(
       GetProxyForUrlAction::DropRequest(GURL(kExampleUrl)));
   CreateProxyResolver();
@@ -703,7 +703,7 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_ClientClosed) {
   EXPECT_EQ(ERR_PAC_SCRIPT_TERMINATED, request1->WaitForResult());
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_DeleteInCallback) {
+TEST_F(ProxyResolverFactoryMojoTest, GetProxyForURL_DeleteInCallback) {
   mock_proxy_resolver_.AddGetProxyAction(GetProxyForUrlAction::ReturnServers(
       GURL(kExampleUrl), ProxyServersFromPacString("DIRECT")));
   CreateProxyResolver();
@@ -712,16 +712,18 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_DeleteInCallback) {
   TestCompletionCallback callback;
   ProxyResolver::RequestHandle handle;
   BoundNetLog net_log;
-  EXPECT_EQ(OK,
-            callback.GetResult(proxy_resolver_mojo_->GetProxyForURL(
-                GURL(kExampleUrl), &results,
-                base::Bind(&ProxyResolverMojoTest::DeleteProxyResolverCallback,
-                           base::Unretained(this), callback.callback()),
-                &handle, net_log)));
+  EXPECT_EQ(
+      OK,
+      callback.GetResult(proxy_resolver_mojo_->GetProxyForURL(
+          GURL(kExampleUrl), &results,
+          base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback,
+                     base::Unretained(this), callback.callback()),
+          &handle, net_log)));
   on_delete_callback_.WaitForResult();
 }
 
-TEST_F(ProxyResolverMojoTest, GetProxyForURL_DeleteInCallbackFromDisconnect) {
+TEST_F(ProxyResolverFactoryMojoTest,
+       GetProxyForURL_DeleteInCallbackFromDisconnect) {
   mock_proxy_resolver_.AddGetProxyAction(
       GetProxyForUrlAction::Disconnect(GURL(kExampleUrl)));
   CreateProxyResolver();
@@ -730,16 +732,17 @@ TEST_F(ProxyResolverMojoTest, GetProxyForURL_DeleteInCallbackFromDisconnect) {
   TestCompletionCallback callback;
   ProxyResolver::RequestHandle handle;
   BoundNetLog net_log;
-  EXPECT_EQ(ERR_PAC_SCRIPT_TERMINATED,
-            callback.GetResult(proxy_resolver_mojo_->GetProxyForURL(
-                GURL(kExampleUrl), &results,
-                base::Bind(&ProxyResolverMojoTest::DeleteProxyResolverCallback,
-                           base::Unretained(this), callback.callback()),
-                &handle, net_log)));
+  EXPECT_EQ(
+      ERR_PAC_SCRIPT_TERMINATED,
+      callback.GetResult(proxy_resolver_mojo_->GetProxyForURL(
+          GURL(kExampleUrl), &results,
+          base::Bind(&ProxyResolverFactoryMojoTest::DeleteProxyResolverCallback,
+                     base::Unretained(this), callback.callback()),
+          &handle, net_log)));
   on_delete_callback_.WaitForResult();
 }
 
-TEST_F(ProxyResolverMojoTest, DeleteResolver) {
+TEST_F(ProxyResolverFactoryMojoTest, DeleteResolver) {
   CreateProxyResolver();
   proxy_resolver_mojo_.reset();
   on_delete_callback_.WaitForResult();
diff --git a/net/proxy/proxy_service_mojo.cc b/net/proxy/proxy_service_mojo.cc
index fe81853..243966d 100644
--- a/net/proxy/proxy_service_mojo.cc
+++ b/net/proxy/proxy_service_mojo.cc
@@ -13,7 +13,7 @@
 #include "net/proxy/mojo_proxy_resolver_impl.h"
 #include "net/proxy/network_delegate_error_observer.h"
 #include "net/proxy/proxy_resolver_factory.h"
-#include "net/proxy/proxy_resolver_mojo.h"
+#include "net/proxy/proxy_resolver_factory_mojo.h"
 #include "net/proxy/proxy_resolver_v8_tracing.h"
 #include "net/proxy/proxy_service.h"