[Cleanup] Add CreateWebContentsWithID helper to TabStripModelTest

chrome/browser/ui/tabs/tab_strip_model_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/ui/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 166 matching lines @@
 
   WebContents* CreateWebContentsWithSharedRPH(WebContents* web_contents) {
     WebContents::CreateParams create_params(
         profile(), web_contents->GetRenderViewHost()->GetSiteInstance());
     WebContents* retval = WebContents::Create(create_params);
     EXPECT_EQ(retval->GetRenderProcessHost(),
               web_contents->GetRenderProcessHost());
     return retval;
   }
 
+  WebContents* CreateWebContentsWithID(int id) {
+    WebContents* contents = CreateWebContents();
+    SetID(contents, id);
+    return contents;
+  }
+
   // Sets the id of the specified contents.
   void SetID(WebContents* contents, int id) {
     contents->SetUserData(&kTabStripModelTestIDUserDataKey,
                           new TabStripModelTestIDUserData(id));
   }
 
   // Returns the id of the specified contents.
   int GetID(WebContents* contents) {
     TabStripModelTestIDUserData* user_data =
         static_cast<TabStripModelTestIDUserData*>(
@@ skipping 34 matching lines @@
         result += " ";
       result += base::IntToString(indices[i]);
     }
     return result;
   }
 
   void PrepareTabstripForSelectionTest(TabStripModel* model,
                                        int tab_count,
                                        int pinned_count,
                                        const std::string& selected_tabs) {
-    for (int i = 0; i < tab_count; ++i) {
-      WebContents* contents = CreateWebContents();
-      SetID(contents, i);
-      model->AppendWebContents(contents, true);
-    }
+    for (int i = 0; i < tab_count; ++i)
+      model->AppendWebContents(CreateWebContentsWithID(i), true);
     for (int i = 0; i < pinned_count; ++i)
       model->SetTabPinned(i, true);
 
     ui::ListSelectionModel selection_model;
     std::vector<std::string> selection;
     base::SplitStringAlongWhitespace(selected_tabs, &selection);
     for (size_t i = 0; i < selection.size(); ++i) {
       int value;
       ASSERT_TRUE(base::StringToInt(selection[i], &value));
       selection_model.AddIndexToSelection(value);
@@ skipping 175 matching lines @@
 TEST_F(TabStripModelTest, TestBasicAPI) {
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
   MockTabStripModelObserver observer(&tabstrip);
   tabstrip.AddObserver(&observer);
 
   EXPECT_TRUE(tabstrip.empty());
 
   typedef MockTabStripModelObserver::State State;
 
-  WebContents* contents1 = CreateWebContents();
-  SetID(contents1, 1);
+  WebContents* contents1 = CreateWebContentsWithID(1);
 
   // Note! The ordering of these tests is important, each subsequent test
   // builds on the state established in the previous. This is important if you
   // ever insert tests rather than append.
 
   // Test AppendWebContents, ContainsIndex
   {
     EXPECT_FALSE(tabstrip.ContainsIndex(0));
     tabstrip.AppendWebContents(contents1, true);
     EXPECT_TRUE(tabstrip.ContainsIndex(0));
     EXPECT_EQ(1, tabstrip.count());
     EXPECT_EQ(3, observer.GetStateCount());
     State s1(contents1, 0, MockTabStripModelObserver::INSERT);
     s1.foreground = true;
     EXPECT_TRUE(observer.StateEquals(0, s1));
     State s2(contents1, 0, MockTabStripModelObserver::ACTIVATE);
     EXPECT_TRUE(observer.StateEquals(1, s2));
     State s3(contents1, 0, MockTabStripModelObserver::SELECT);
     s3.src_contents = NULL;
     s3.src_index = ui::ListSelectionModel::kUnselectedIndex;
     EXPECT_TRUE(observer.StateEquals(2, s3));
     observer.ClearStates();
   }
   EXPECT_EQ("1", GetTabStripStateString(tabstrip));
 
   // Test InsertWebContentsAt, foreground tab.
-  WebContents* contents2 = CreateWebContents();
-  SetID(contents2, 2);
+  WebContents* contents2 = CreateWebContentsWithID(2);
   {
     tabstrip.InsertWebContentsAt(1, contents2, TabStripModel::ADD_ACTIVE);
 
     EXPECT_EQ(2, tabstrip.count());
     EXPECT_EQ(4, observer.GetStateCount());
     State s1(contents2, 1, MockTabStripModelObserver::INSERT);
     s1.foreground = true;
     EXPECT_TRUE(observer.StateEquals(0, s1));
     State s2(contents1, 0, MockTabStripModelObserver::DEACTIVATE);
     EXPECT_TRUE(observer.StateEquals(1, s2));
     State s3(contents2, 1, MockTabStripModelObserver::ACTIVATE);
     s3.src_contents = contents1;
     EXPECT_TRUE(observer.StateEquals(2, s3));
     State s4(contents2, 1, MockTabStripModelObserver::SELECT);
     s4.src_contents = contents1;
     s4.src_index = 0;
     EXPECT_TRUE(observer.StateEquals(3, s4));
     observer.ClearStates();
   }
   EXPECT_EQ("1 2", GetTabStripStateString(tabstrip));
 
   // Test InsertWebContentsAt, background tab.
-  WebContents* contents3 = CreateWebContents();
-  SetID(contents3, 3);
+  WebContents* contents3 = CreateWebContentsWithID(3);
   {
     tabstrip.InsertWebContentsAt(2, contents3, TabStripModel::ADD_NONE);
 
     EXPECT_EQ(3, tabstrip.count());
     EXPECT_EQ(1, observer.GetStateCount());
     State s1(contents3, 2, MockTabStripModelObserver::INSERT);
     s1.foreground = false;
     EXPECT_TRUE(observer.StateEquals(0, s1));
     observer.ClearStates();
   }
@@ skipping 1305 matching lines @@
 #endif
 
   base::DictionaryValue manifest;
   manifest.SetString("name", "hi!");
   manifest.SetString("version", "1");
   manifest.SetString("app.launch.web_url", "http://www.google.com");
   std::string error;
   scoped_refptr<Extension> extension_app(
       Extension::Create(path, extensions::Manifest::INVALID_LOCATION,
                         manifest, Extension::NO_FLAGS, &error));
-  WebContents* contents1 = CreateWebContents();
+  WebContents* contents1 = CreateWebContentsWithID(1);
   extensions::TabHelper::CreateForWebContents(contents1);
   extensions::TabHelper::FromWebContents(contents1)
       ->SetExtensionApp(extension_app.get());
-  WebContents* contents2 = CreateWebContents();
+  WebContents* contents2 = CreateWebContentsWithID(2);
   extensions::TabHelper::CreateForWebContents(contents2);
   extensions::TabHelper::FromWebContents(contents2)
       ->SetExtensionApp(extension_app.get());
-  WebContents* contents3 = CreateWebContents();
-
-  SetID(contents1, 1);
-  SetID(contents2, 2);
-  SetID(contents3, 3);
+  WebContents* contents3 = CreateWebContentsWithID(3);
 
   // Note! The ordering of these tests is important, each subsequent test
   // builds on the state established in the previous. This is important if you
   // ever insert tests rather than append.
 
   // Initial state, tab3 only and selected.
   tabstrip.AppendWebContents(contents3, true);
 
   observer.ClearStates();
 
@@ skipping 89 matching lines @@
 TEST_F(TabStripModelTest, Pinning) {
   TabStripDummyDelegate delegate;
   TabStripModel tabstrip(&delegate, profile());
   MockTabStripModelObserver observer(&tabstrip);
   tabstrip.AddObserver(&observer);
 
   EXPECT_TRUE(tabstrip.empty());
 
   typedef MockTabStripModelObserver::State State;
 
-  WebContents* contents1 = CreateWebContents();
-  WebContents* contents2 = CreateWebContents();
-  WebContents* contents3 = CreateWebContents();
-
-  SetID(contents1, 1);
-  SetID(contents2, 2);
-  SetID(contents3, 3);
+  WebContents* contents1 = CreateWebContentsWithID(1);
+  WebContents* contents2 = CreateWebContentsWithID(2);
+  WebContents* contents3 = CreateWebContentsWithID(3);
 
   // Note! The ordering of these tests is important, each subsequent test
   // builds on the state established in the previous. This is important if you
   // ever insert tests rather than append.
 
   // Initial state, three tabs, first selected.
   tabstrip.AppendWebContents(contents1, true);
   tabstrip.AppendWebContents(contents2, false);
   tabstrip.AppendWebContents(contents3, false);
 
@@ skipping 108 matching lines @@
   // Pin "3" and "1".
   {
     tabstrip.SetTabPinned(0, true);
     tabstrip.SetTabPinned(1, true);
 
     EXPECT_EQ("1p 3p 2", GetTabStripStateString(tabstrip));
 
     observer.ClearStates();
   }
 
-  WebContents* contents4 = CreateWebContents();
-  SetID(contents4, 4);
+  WebContents* contents4 = CreateWebContentsWithID(4);
 
   // Insert "4" between "1" and "3". As "1" and "4" are pinned, "4" should end
   // up after them.
   {
     tabstrip.InsertWebContentsAt(1, contents4, TabStripModel::ADD_NONE);
 
     ASSERT_EQ(1, observer.GetStateCount());
     State state(contents4, 2, MockTabStripModelObserver::INSERT);
     EXPECT_TRUE(observer.StateEquals(0, state));
 
@@ skipping 483 matching lines @@
   WebContents* moved_contents = strip_src.DetachWebContentsAt(1);
   EXPECT_EQ(contents2, moved_contents);
 
   // Attach the tab to the destination tab strip.
   strip_dst.AppendWebContents(moved_contents, true);
   EXPECT_TRUE(strip_dst.IsTabBlocked(0));
 
   strip_dst.CloseAllTabs();
   strip_src.CloseAllTabs();
 }