Trim code from sync's ServerConnectionManager

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2012 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/browser/sync/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 98 matching lines @@
 }
 
 SyncTest::SyncTest(TestType test_type)
     : sync_server_(net::TestServer::TYPE_SYNC,
                    net::TestServer::kLocalhost,
                    FilePath()),
       test_type_(test_type),
       server_type_(SERVER_TYPE_UNDECIDED),
       num_clients_(-1),
       use_verifier_(true),
+      notifications_enabled_(true),
       test_server_handle_(base::kNullProcessHandle),
       number_of_default_sync_items_(0) {
   InProcessBrowserTest::set_show_window(true);
   sync_datatype_helper::AssociateWithTest(this);
   switch (test_type_) {
     case SINGLE_CLIENT: {
       num_clients_ = 1;
       break;
     }
     case TWO_CLIENT: {
@@ skipping 425 matching lines @@
     sync_url_status, content::URLFetcher::GET, &delegate));
   fetcher->SetRequestContext(g_browser_process->system_request_context());
   fetcher->Start();
   ui_test_utils::RunMessageLoop();
   return delegate.running();
 }
 
 void SyncTest::EnableNetwork(Profile* profile) {
   SetProxyConfig(profile->GetRequestContext(),
                  net::ProxyConfig::CreateDirect());
+  if (notifications_enabled_) {
+    EnableNotificationsImpl();
+  }
   // TODO(rsimha): Remove this line once http://crbug.com/53857 is fixed.
   net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
 }
 
 void SyncTest::DisableNetwork(Profile* profile) {
+  DisableNotificationsImpl();
   // Set the current proxy configuration to a nonexistent proxy to effectively
   // disable networking.
   net::ProxyConfig config;
   config.proxy_rules().ParseFromString("http=127.0.0.1:0");
   SetProxyConfig(profile->GetRequestContext(), config);
   // TODO(rsimha): Remove this line once http://crbug.com/53857 is fixed.
   net::NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
 }
 
 bool SyncTest::EnableEncryption(int index, syncable::ModelType type) {
   return GetClient(index)->EnableEncryptionForType(type);
 }
 
 bool SyncTest::IsEncrypted(int index, syncable::ModelType type) {
   return GetClient(index)->IsTypeEncrypted(type);
 }
 
 bool SyncTest::AwaitQuiescence() {
   return ProfileSyncServiceHarness::AwaitQuiescence(clients());
 }
 
 bool SyncTest::ServerSupportsNotificationControl() const {
   EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
 
   // Supported only if we're using the python testserver.
   return server_type_ == LOCAL_PYTHON_SERVER;
 }
 
-void SyncTest::DisableNotifications() {
+void SyncTest::DisableNotificationsImpl() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   std::string path = "chromiumsync/disablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications disabled",
             UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle()));
 }
 
-void SyncTest::EnableNotifications() {
+void SyncTest::DisableNotifications() {
+  DisableNotificationsImpl();
+  notifications_enabled_ = false;
+}
+
+void SyncTest::EnableNotificationsImpl() {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   std::string path = "chromiumsync/enablenotifications";
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notifications enabled",
             UTF16ToASCII(browser()->GetSelectedWebContents()->GetTitle()));
 }
 
+void SyncTest::EnableNotifications() {
+  EnableNotificationsImpl();
+  notifications_enabled_ = true;
+}
+
 void SyncTest::TriggerNotification(
     syncable::ModelTypeSet changed_types) {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   const std::string& data =
       sync_notifier::P2PNotificationData("from_server",
                                          sync_notifier::NOTIFY_ALL,
                                          changed_types).ToString();
   const std::string& path =
       std::string("chromiumsync/sendnotification?channel=") +
       sync_notifier::kSyncP2PNotificationChannel + "&data=" + data;
@@ skipping 137 matching lines @@
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }