Replace setup APIs with session APIs

chrome/browser/extensions/api/gcd_private/gcd_private_api.h

Index: chrome/browser/extensions/api/gcd_private/gcd_private_api.h
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.h b/chrome/browser/extensions/api/gcd_private/gcd_private_api.h
index 208744d261c4aea7531fce2da08eea129e923c61..488b60810cf25d73099a75c74f0879945c9acfb3 100644
--- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.h
+++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.h
@@ -114,47 +114,43 @@ class GcdPrivateQueryForNewLocalDevicesFunction
   virtual bool RunSync() OVERRIDE;
 };
 
-class GcdPrivateStartSetupFunction : public ChromeAsyncExtensionFunction {
- public:
+class GcdPrivatePrefetchWifiPasswordFunction
+    : public ChromeAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("gcdPrivate.startSetup", GCDPRIVATE_STARTSETUP)
+  DECLARE_EXTENSION_FUNCTION("gcdPrivate.prefetchWifiPassword",
+                             GCDPRIVATE_PREFETCHWIFIPASSWORD)
 
-  GcdPrivateStartSetupFunction();
+  GcdPrivatePrefetchWifiPasswordFunction();
 
  protected:
-  virtual ~GcdPrivateStartSetupFunction();
+  virtual ~GcdPrivatePrefetchWifiPasswordFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
-
- private:
 };
 
-class GcdPrivateSetWiFiNetworkFunction : public ChromeAsyncExtensionFunction {
+class GcdPrivateEstablishSessionFunction : public ChromeAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("gcdPrivate.setWiFiNetwork",
-                             GCDPRIVATE_SETWIFINETWORK)
+  DECLARE_EXTENSION_FUNCTION("gcdPrivate.establishSession",
+                             GCDPRIVATE_ESTABLISHSESSION)
 
-  GcdPrivateSetWiFiNetworkFunction();
+  GcdPrivateEstablishSessionFunction();
 
  protected:
-  virtual ~GcdPrivateSetWiFiNetworkFunction();
+  virtual ~GcdPrivateEstablishSessionFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
-
- private:
 };
 
-class GcdPrivateSetWiFiPasswordFunction : public ChromeAsyncExtensionFunction {
+class GcdPrivateConfirmCodeFunction : public ChromeAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("gcdPrivate.setWiFiPassword",
-                             GCDPRIVATE_SETWIFIPASSWORD)
+  DECLARE_EXTENSION_FUNCTION("gcdPrivate.confirmCode", GCDPRIVATE_CONFIRMCODE)
 
-  GcdPrivateSetWiFiPasswordFunction();
+  GcdPrivateConfirmCodeFunction();
 
  protected:
-  virtual ~GcdPrivateSetWiFiPasswordFunction();
+  virtual ~GcdPrivateConfirmCodeFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -162,14 +158,14 @@ class GcdPrivateSetWiFiPasswordFunction : public ChromeAsyncExtensionFunction {
  private:
 };
 
-class GcdPrivateConfirmCodeFunction : public ChromeAsyncExtensionFunction {
+class GcdPrivateSendMessageFunction : public ChromeAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("gcdPrivate.confirmCode", GCDPRIVATE_CONFIRMCODE)
+  DECLARE_EXTENSION_FUNCTION("gcdPrivate.sendMessage", GCDPRIVATE_SENDMESSAGE)
 
-  GcdPrivateConfirmCodeFunction();
+  GcdPrivateSendMessageFunction();
 
  protected:
-  virtual ~GcdPrivateConfirmCodeFunction();
+  virtual ~GcdPrivateSendMessageFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -177,19 +173,18 @@ class GcdPrivateConfirmCodeFunction : public ChromeAsyncExtensionFunction {
  private:
 };
 
-class GcdPrivateStopSetupFunction : public ChromeAsyncExtensionFunction {
+class GcdPrivateTerminateSessionFunction : public ChromeAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("gcdPrivate.stopSetup", GCDPRIVATE_STOPSETUP)
+  DECLARE_EXTENSION_FUNCTION("gcdPrivate.terminateSession",
+                             GCDPRIVATE_TERMINATESESSION)
 
-  GcdPrivateStopSetupFunction();
+  GcdPrivateTerminateSessionFunction();
 
  protected:
-  virtual ~GcdPrivateStopSetupFunction();
+  virtual ~GcdPrivateTerminateSessionFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
-
- private:
 };
 
 class GcdPrivateGetCommandDefinitionsFunction