Consolidate Browser Creation.

. Make all instantiators use a single ctor that takes CreateParams.
. Get rid of InitBrowserWindow() and make CreateBrowserWindow() a anonymous namespace function in browser.cc

http://crbug.com/133576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10692195

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148396 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 1 deletions

diff --git a/chrome/browser/sync/sync_global_error_unittest.cc b/chrome/browser/sync/sync_global_error_unittest.cc
index 312a5a4..dd25d23 100644
--- a/chrome/browser/sync/sync_global_error_unittest.cc
+++ b/chrome/browser/sync/sync_global_error_unittest.cc
@@ -28,6 +28,8 @@ using content::BrowserThread;
 
 namespace {
 
+#if 0
+// TODO(altimofeev) See below.
 class BrowserMock: public Browser {
  public:
   explicit BrowserMock(Type type, Profile* profile) : Browser(type, profile) {}
@@ -35,6 +37,7 @@ class BrowserMock: public Browser {
   MOCK_METHOD2(ExecuteCommandWithDisposition,
                void(int command_id, WindowOpenDisposition));
 };
+#endif
 
 class LoginUIServiceMock: public LoginUIService {
  public:
@@ -53,6 +56,8 @@ class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
   SyncGlobalErrorTest() {}
   virtual ~SyncGlobalErrorTest() {}
 
+#if 0
+  // TODO(altimofeev): see below.
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
 
@@ -65,6 +70,7 @@ class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
   virtual void TearDown() OVERRIDE {
     testing::Test::TearDown();
   }
+#endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncGlobalErrorTest);
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 05fca77..8bab5a9 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -281,7 +281,7 @@ void SyncTest::InitializeInstance(int index) {
   EXPECT_FALSE(GetProfile(index) == NULL) << "Could not create Profile "
                                           << index << ".";
 
-  browsers_[index] = Browser::Create(GetProfile(index));
+  browsers_[index] = new Browser(Browser::CreateParams(GetProfile(index)));
   EXPECT_FALSE(GetBrowser(index) == NULL) << "Could not create Browser "
                                           << index << ".";