Consolidate Browser Creation.

chrome/browser/managed_mode_unittest.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/managed_mode.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 47 matching lines @@
     return true;
   }
 
  private:
   bool in_managed_mode_;
   bool should_cancel_enter_;
 };
 
 class MockBrowserWindow : public TestBrowserWindow {
  public:
-  explicit MockBrowserWindow(Browser* browser) : TestBrowserWindow(browser) {
-  }
-
   MOCK_METHOD0(Close, void());
 };
 
 class BrowserFixture {
  public:
   BrowserFixture(FakeManagedMode* managed_mode,
-                 TestingProfile* profile)
-      : browser_(Browser::TYPE_TABBED, profile),
-        window_(&browser_) {
-    browser_.SetWindowForTesting(&window_);
+                 TestingProfile* profile) {
+    Browser::CreateParams params(profile);
+    params.window = &window_;
+    browser_.reset(new Browser(params));
   }
 
   ~BrowserFixture() {
   }
 
   MockBrowserWindow* window() {
     return &window_;
   }
 
  private:
-  Browser browser_;
+  scoped_ptr<Browser> browser_;
   StrictMock<MockBrowserWindow> window_;
 };
 
 class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
  public:
   explicit MockCallback(FakeManagedMode* managed_mode)
       : managed_mode_(managed_mode) {
   }
 
   void CheckManagedMode(bool success) {
@@ skipping 139 matching lines @@
   EXPECT_TRUE(managed_mode_.UserMayModifySettings(NULL, NULL));
 
   managed_mode_.SetInManagedMode(&managed_mode_profile_);
   EXPECT_FALSE(managed_mode_.UserMayLoad(NULL, NULL));
   EXPECT_FALSE(managed_mode_.UserMayModifySettings(NULL, NULL));
 
 #ifndef NDEBUG
   EXPECT_FALSE(managed_mode_.GetDebugPolicyProviderName().empty());
 #endif
 }