Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.

tests/gclient_test.py

Index: tests/gclient_test.py
diff --git a/tests/gclient_test.py b/tests/gclient_test.py
index dc3dff4a5c182c799b5ec9268fdea98431c8f490..e21c20ae7dceef52a27e55f185d426d8a7347954 100755
--- a/tests/gclient_test.py
+++ b/tests/gclient_test.py
@@ -22,8 +22,6 @@ import __builtin__
 import StringIO
 
 import gclient
-# Temporary due to the "from scm import *" in gclient_scm.
-import scm
 from super_mox import mox, IsOneOf, SuperMoxTestBase
 
 
@@ -50,16 +48,11 @@ class GClientBaseTestCase(BaseTestCase):
     self.mox.StubOutWithMock(gclient.gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'RemoveDirectory')
     # Mock them to be sure nothing bad happens.
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'CaptureSVN')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'CaptureSVNInfo')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'CaptureSVNStatus')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'RunSVN')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'RunSVNAndGetFileList')
-    self.mox.StubOutWithMock(scm, 'CaptureSVN')
-    self.mox.StubOutWithMock(scm, 'CaptureSVNInfo')
-    self.mox.StubOutWithMock(scm, 'CaptureSVNStatus')
-    self.mox.StubOutWithMock(scm, 'RunSVN')
-    self.mox.StubOutWithMock(scm, 'RunSVNAndGetFileList')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'Capture')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'CaptureInfo')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'CaptureStatus')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'Run')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'RunAndGetFileList')
     self._gclient_gclient = gclient.GClient
     gclient.GClient = self.mox.CreateMockAnything()
     self._scm_wrapper = gclient.gclient_scm.CreateSCM