Port perf.py's _LoginToGoogleAccount to chrome_remote_control

tools/chrome_remote_control/chrome_remote_control/page_set.py

Index: tools/chrome_remote_control/chrome_remote_control/page_set.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_set.py b/tools/chrome_remote_control/chrome_remote_control/page_set.py
index 02d121128962ceb4fc81ffcae8be312d197f2646..94d4ca2c29d223615b2bbe2aa4a53c49bd3ef82d 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_set.py
+++ b/tools/chrome_remote_control/chrome_remote_control/page_set.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 import json
 import urlparse
+import os
 
 class Page(object):
   def __init__(self, url, attributes=None):
@@ -24,9 +25,11 @@ class Page(object):
     return self.url
 
 class PageSet(object):
-  def __init__(self, description='', file_path=''):
+  def __init__(self, description='', file_path='',
+               credentials_path='credentials.json'):

[nduca, 2012/10/02 18:02:10]

can we just default to None, and assume no credentials if credentials_path=None?

[hartmanng, 2012/10/02 20:18:16]

Done.

     self.description = description
     self.file_path = file_path
+    self.credentials_path = credentials_path
     self.pages = []
 
   @classmethod
@@ -36,9 +39,19 @@ class PageSet(object):
       data = json.loads(contents)
       return cls.FromDict(data, file_path)
 
+  @staticmethod
+  def GetCredentialsPath(data, file_path):

[nduca, 2012/10/02 18:02:10]

this bit i dont quite get... why are you computing this here rather than in the
constructor?

[hartmanng, 2012/10/02 20:18:16]

Done.

+    credentials_path = os.path.join(os.path.dirname(file_path),
+                                    'credentials.json')
+    if 'credentials_path' in data:
+      credentials_path = os.path.join(os.path.dirname(file_path),
+                                      data['credentials_path'])
+    return credentials_path
+
   @classmethod
   def FromDict(cls, data, file_path=''):
-    page_set = cls(data['description'], file_path)
+    credentials_path = cls.GetCredentialsPath(data, file_path)
+    page_set = cls(data['description'], file_path, credentials_path)

[nduca, 2012/10/02 18:02:10]

if you set credentials path to be the fully qualified location here, then you
can avoid this mess.

[hartmanng, 2012/10/02 20:18:16]

Done.

     for page_attributes in data['pages']:
       url = page_attributes.pop('url')
       page = Page(url, page_attributes)