[Sync] Add support for enabling session sync remotely.

chrome/test/live_sync/live_sync_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 133 matching lines @@
   if (cl->HasSwitch(switches::kPasswordFileForTest)) {
     ReadPasswordFile();
   } else if (cl->HasSwitch(switches::kSyncUserForTest) &&
              cl->HasSwitch(switches::kSyncPasswordForTest)) {
     username_ = cl->GetSwitchValueASCII(switches::kSyncUserForTest);
     password_ = cl->GetSwitchValueASCII(switches::kSyncPasswordForTest);
   } else {
     SetupMockGaiaResponses();
   }
 
-   if (!cl->HasSwitch(switches::kSyncServiceURL) &&
-       !cl->HasSwitch(switches::kSyncServerCommandLine)) {
-    // If neither a sync server URL nor a sync server command line is
-    // provided, start up a local python sync test server and point Chrome
-    // to its URL.  This is the most common configuration, and the only
-    // one that makes sense for most developers.
-    server_type_ = LOCAL_PYTHON_SERVER;
-   } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
+  if (!cl->HasSwitch(switches::kSyncServiceURL) &&
+      !cl->HasSwitch(switches::kSyncServerCommandLine)) {
+   // If neither a sync server URL nor a sync server command line is
+   // provided, start up a local python sync test server and point Chrome
+   // to its URL.  This is the most common configuration, and the only
+   // one that makes sense for most developers.
+   server_type_ = LOCAL_PYTHON_SERVER;
+  } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
               cl->HasSwitch(switches::kSyncServerCommandLine)) {
     // If a sync server URL and a sync server command line are provided,
     // start up a local sync server by running the command line. Chrome
     // will connect to the server at the URL that was provided.
     server_type_ = LOCAL_LIVE_SERVER;
   } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
              !cl->HasSwitch(switches::kSyncServerCommandLine)) {
     // If a sync server URL is provided, but not a server command line,
     // it is assumed that the server is already running. Chrome will
     // automatically connect to it at the URL provided. There is nothing
@@ skipping 22 matching lines @@
   InProcessBrowserTest::TearDown();
 
   // Stop the local python test server. This is a no-op if one wasn't started.
   TearDownLocalPythonTestServer();
 
   // Stop the local sync test server. This is a no-op if one wasn't started.
   TearDownLocalTestServer();
 }
 
 void LiveSyncTest::SetUpCommandLine(CommandLine* cl) {
+  AddTestSwitches(cl);
+  AddOptionalTypesToCommandLine(cl);
+}
+
+void LiveSyncTest::AddTestSwitches(CommandLine* cl) {
   // TODO(rsimha): Until we implement a fake Tango server against which tests
   // can run, we need to set the --sync-notification-method to "p2p".
   if (!cl->HasSwitch(switches::kSyncNotificationMethod))
     cl->AppendSwitchASCII(switches::kSyncNotificationMethod, "p2p");
 
-  // TODO(sync): Remove this once sessions sync is enabled by default.
-  if (!cl->HasSwitch(switches::kEnableSyncSessions))
-    cl->AppendSwitch(switches::kEnableSyncSessions);
-
   // Disable non-essential access of external network resources.
   if (!cl->HasSwitch(switches::kDisableBackgroundNetworking))
     cl->AppendSwitch(switches::kDisableBackgroundNetworking);
 }
 
+void LiveSyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {
+  // TODO(sync): Remove this once sessions sync is enabled by default.
+  if (!cl->HasSwitch(switches::kEnableSyncSessions))
+    cl->AppendSwitch(switches::kEnableSyncSessions);
+}
+
 // static
 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.Append(name);
 
   if (!file_util::PathExists(path))
     CHECK(file_util::CreateDirectory(path));
 
   return Profile::CreateProfile(path);
@@ skipping 122 matching lines @@
   if (password_file_.empty())
     LOG(FATAL) << "Can't run live server test without specifying --"
                << switches::kPasswordFileForTest << "=<filename>";
   std::string file_contents;
   file_util::ReadFileToString(password_file_, &file_contents);
   ASSERT_NE(file_contents, "") << "Password file \""
       << password_file_.value() << "\" does not exist.";
   std::vector<std::string> tokens;
   std::string delimiters = "\r\n";
   Tokenize(file_contents, delimiters, &tokens);
-  ASSERT_TRUE(tokens.size() == 2) << "Password file \""
+  ASSERT_EQ(2U, tokens.size()) << "Password file \""
       << password_file_.value()
       << "\" must contain exactly two lines of text.";
   username_ = tokens[0];
   password_ = tokens[1];
 }
 
 void LiveSyncTest::SetupMockGaiaResponses() {
   username_ = "user@gmail.com";
   password_ = "password";
   integration_factory_.reset(new URLFetcherFactory());
@@ skipping 193 matching lines @@
 }
 
 void LiveSyncTest::TriggerTransientError() {
   ASSERT_TRUE(ServerSupportsErrorTriggering());
   std::string path = "chromiumsync/transienterror";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Transient error",
             UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
 }
 
+void LiveSyncTest::TriggerSetSyncTabs() {
+  ASSERT_TRUE(ServerSupportsErrorTriggering());
+  std::string path = "chromiumsync/synctabs";
+  ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
+  ASSERT_EQ("Sync Tabs",
+            UTF16ToASCII(browser()->GetSelectedTabContents()->GetTitle()));
+}
+
 void LiveSyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                                   const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
                              proxy_config));
   done.Wait();
 }