Make contents settable in RVHTH.

content/browser/webui/web_ui_unittest.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/browser/ui/webui/new_tab_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
@@ skipping 148 matching lines @@
  private:
   int focus_called_;
 };
 
 TEST_F(WebUITest, FocusOnNavigate) {
   // Setup.  |tc| will be used to track when we try to focus the location bar.
   TabContentsForFocusTest* tc = new TabContentsForFocusTest(
       contents()->profile(),
       SiteInstance::CreateSiteInstance(contents()->profile()));
   tc->controller().CopyStateFrom(controller());
-  scoped_ptr<TestTabContents> tc_scoped_ptr(tc);
-  contents_.swap(tc_scoped_ptr);
+  SetContents(tc);
   int page_id = 200;
 
   // Load the NTP.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
   controller().LoadURL(new_tab_url, GURL(), PageTransition::LINK);
   rvh()->SendNavigate(page_id, new_tab_url);
 
   // Navigate to another page.
   GURL next_url("http://google.com/");
   int next_page_id = page_id + 1;
   controller().LoadURL(next_url, GURL(), PageTransition::LINK);
   pending_rvh()->SendNavigate(next_page_id, next_url);
 
   // Navigate back.  Should focus the location bar.
   int focus_called = tc->focus_called();
   ASSERT_TRUE(controller().CanGoBack());
   controller().GoBack();
   pending_rvh()->SendNavigate(page_id, new_tab_url);
   EXPECT_LT(focus_called, tc->focus_called());
 
   // Navigate forward.  Shouldn't focus the location bar.
   focus_called = tc->focus_called();
   ASSERT_TRUE(controller().CanGoForward());
   controller().GoForward();
   pending_rvh()->SendNavigate(next_page_id, next_url);
   EXPECT_EQ(focus_called, tc->focus_called());
-
-  contents_.swap(tc_scoped_ptr);
 }