Rename PrivetV2 to PrivetV3

Looks like the next version of privet will be version 3, not version 2. Updating
accordingly.

BUG=372843

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273182 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/local_discovery/privetv2_session.cc → chrome/browser/local_discovery/privetv3_session.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/local_discovery/privetv2_session.h"
+#include "chrome/browser/local_discovery/privetv3_session.h"
 
 #include "base/logging.h"
 
 namespace local_discovery {
 
-scoped_ptr<PrivetV2Session> PrivetV2Session::Create(PrivetHTTPClient* client) {
+scoped_ptr<PrivetV3Session> PrivetV3Session::Create(PrivetHTTPClient* client) {
   NOTIMPLEMENTED();
-  return scoped_ptr<PrivetV2Session>();
+  return scoped_ptr<PrivetV3Session>();
 }
 
 }  // namespace local_discovery

chrome/browser/local_discovery/privetv2_session.h → chrome/browser/local_discovery/privetv3_session.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 CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SESSION_H_
-#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SESSION_H_
+#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SESSION_H_
+#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SESSION_H_
 
 #include <string>
 
@@ -15,7 +15,7 @@ namespace local_discovery {
 
 class PrivetHTTPClient;
 
-class PrivetV2Session {
+class PrivetV3Session {
  public:
   typedef base::Callback<
       void(bool success, const base::DictionaryValue& response)>
@@ -43,9 +43,9 @@ class PrivetV2Session {
     virtual void Start() = 0;
   };
 
-  virtual ~PrivetV2Session() {}
+  virtual ~PrivetV3Session() {}
 
-  static scoped_ptr<PrivetV2Session> Create(PrivetHTTPClient* client);
+  static scoped_ptr<PrivetV3Session> Create(PrivetHTTPClient* client);
 
   // Establish a session, will call |OnSetupConfirmationNeeded| and then
   // |OnSessionEstablished|.
@@ -60,4 +60,4 @@ class PrivetV2Session {
 
 }  // namespace local_discovery
 
-#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SESSION_H_
+#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SESSION_H_

chrome/browser/local_discovery/privetv2_setup_flow.cc → chrome/browser/local_discovery/privetv3_setup_flow.cc

@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/local_discovery/privetv2_setup_flow.h"
+#include "chrome/browser/local_discovery/privetv3_setup_flow.h"
 
 #include "base/logging.h"
 
 namespace local_discovery {
 
-scoped_ptr<PrivetV2SetupFlow> PrivetV2SetupFlow::CreateMDnsOnlyFlow(
+scoped_ptr<PrivetV3SetupFlow> PrivetV3SetupFlow::CreateMDnsOnlyFlow(
     ServiceDiscoveryClient* service_discovery_client,
     const std::string& service_name) {
   NOTIMPLEMENTED();
-  return scoped_ptr<PrivetV2SetupFlow>();
+  return scoped_ptr<PrivetV3SetupFlow>();
 }
 
 #if defined(ENABLE_WIFI_BOOTSTRAPPING)
-scoped_ptr<PrivetV2SetupFlow> PrivetV2SetupFlow::CreateWifiFlow(
+scoped_ptr<PrivetV3SetupFlow> PrivetV3SetupFlow::CreateWifiFlow(
     ServiceDiscoveryClient* service_discovery_client,
     wifi::WifiManager* wifi_manager,
     // The SSID of the network whose credentials we will be provisioning.
@@ -24,7 +24,7 @@ scoped_ptr<PrivetV2SetupFlow> PrivetV2SetupFlow::CreateWifiFlow(
     // The SSID of the device we will be provisioning.
     const std::string& device_ssid) {
   NOTIMPLEMENTED();
-  return scoped_ptr<PrivetV2SetupFlow>();
+  return scoped_ptr<PrivetV3SetupFlow>();
 }
 #endif
 

chrome/browser/local_discovery/privetv2_setup_flow.h → chrome/browser/local_discovery/privetv3_setup_flow.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 CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SETUP_FLOW_H_
-#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SETUP_FLOW_H_
+#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SETUP_FLOW_H_
+#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SETUP_FLOW_H_
 
 #include <string>
 
@@ -20,7 +20,7 @@ class WifiManager;
 };
 #endif
 
-class PrivetV2SetupFlow {
+class PrivetV3SetupFlow {
  public:
   class Delegate {
    public:
@@ -43,14 +43,14 @@ class PrivetV2SetupFlow {
     virtual void OnSetupError() = 0;
   };
 
-  virtual ~PrivetV2SetupFlow() {}
+  virtual ~PrivetV3SetupFlow() {}
 
-  static scoped_ptr<PrivetV2SetupFlow> CreateMDnsOnlyFlow(
+  static scoped_ptr<PrivetV3SetupFlow> CreateMDnsOnlyFlow(
       ServiceDiscoveryClient* service_discovery_client,
       const std::string& service_name);
 
 #if defined(ENABLE_WIFI_BOOTSTRAPPING)
-  static scoped_ptr<PrivetV2SetupFlow> CreateWifiFlow(
+  static scoped_ptr<PrivetV3SetupFlow> CreateWifiFlow(
       ServiceDiscoveryClient* service_discovery_client,
       wifi::WifiManager* wifi_manager,
       // The SSID of the network whose credentials we will be provisioning.
@@ -64,4 +64,4 @@ class PrivetV2SetupFlow {
 
 }  // namespace local_discovery
 
-#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SETUP_FLOW_H_
+#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SETUP_FLOW_H_

chrome/browser/local_discovery/privetv2_setup_operation.cc → chrome/browser/local_discovery/privetv3_setup_operation.cc

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/local_discovery/privetv2_setup_operation.h"
+#include "chrome/browser/local_discovery/privetv3_setup_operation.h"
 
 #include "base/logging.h"
 
 namespace local_discovery {
 
-scoped_ptr<PrivetV2SetupOperation> PrivetV2SetupOperation::Create(
-    PrivetV2Session* session,
+scoped_ptr<PrivetV3SetupOperation> PrivetV3SetupOperation::Create(
+    PrivetV3Session* session,
     const SetupStatusCallback& callback,
     const std::string& ticket_id) {
   NOTIMPLEMENTED();
-  return scoped_ptr<PrivetV2SetupOperation>();
+  return scoped_ptr<PrivetV3SetupOperation>();
 }
 
 }  // namespace local_discovery

chrome/browser/local_discovery/privetv2_setup_operation.h → chrome/browser/local_discovery/privetv3_setup_operation.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 CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SETUP_OPERATION_H_
-#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SETUP_OPERATION_H_
+#ifndef CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SETUP_OPERATION_H_
+#define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SETUP_OPERATION_H_
 
 #include <string>
 
@@ -12,18 +12,18 @@
 
 namespace local_discovery {
 
-class PrivetV2Session;
+class PrivetV3Session;
 
-class PrivetV2SetupOperation {
+class PrivetV3SetupOperation {
  public:
   enum Status { STATUS_SUCCESS, STATUS_SETUP_ERROR, STATUS_SESSION_ERROR };
 
-  virtual ~PrivetV2SetupOperation() {}
+  virtual ~PrivetV3SetupOperation() {}
 
   typedef base::Callback<void(Status status)> SetupStatusCallback;
 
-  static scoped_ptr<PrivetV2SetupOperation> Create(
-      PrivetV2Session* session,
+  static scoped_ptr<PrivetV3SetupOperation> Create(
+      PrivetV3Session* session,
       const SetupStatusCallback& callback,
       const std::string& ticket_id);
 
@@ -34,4 +34,4 @@ class PrivetV2SetupOperation {
 
 }  // namespace local_discovery
 
-#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV2_SETUP_OPERATION_H_
+#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVETV3_SETUP_OPERATION_H_

chrome/chrome_browser.gypi

@@ -976,12 +976,12 @@
         'browser/local_discovery/privet_local_printer_lister.cc',
         'browser/local_discovery/privet_url_fetcher.cc',
         'browser/local_discovery/privet_url_fetcher.h',
-        'browser/local_discovery/privetv2_session.cc',
-        'browser/local_discovery/privetv2_session.h',
-        'browser/local_discovery/privetv2_setup_flow.cc',
-        'browser/local_discovery/privetv2_setup_flow.h',
-        'browser/local_discovery/privetv2_setup_operation.cc',
-        'browser/local_discovery/privetv2_setup_operation.h',
+        'browser/local_discovery/privetv3_session.cc',
+        'browser/local_discovery/privetv3_session.h',
+        'browser/local_discovery/privetv3_setup_flow.cc',
+        'browser/local_discovery/privetv3_setup_flow.h',
+        'browser/local_discovery/privetv3_setup_operation.cc',
+        'browser/local_discovery/privetv3_setup_operation.h',
         'browser/local_discovery/pwg_raster_converter.cc',
         'browser/local_discovery/pwg_raster_converter.h',
         'browser/local_discovery/service_discovery_client_mac.h',