Moved WebDataService to ProfileKeyedService

chrome/browser/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/tabs/tab_strip_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/property_bag.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model_delegate.h"
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/tabs/test_tab_strip_model_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
@@ skipping 95 matching lines @@
   bool can_close_;
 
   // Whether to report that we need to run an unload listener before closing.
   bool run_unload_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStripDummyDelegate);
 };
 
 class TabStripModelTest : public ChromeRenderViewHostTestHarness {
  public:
-  TabStripModelTest() : browser_thread_(BrowserThread::UI, &message_loop_) {
+  TabStripModelTest()
+      : browser_thread_(BrowserThread::UI, &message_loop_),

[sky, 2012/04/17 20:45:51]

Promote this code to either ChromeRenderViewHostTestHarness , or a new
superclass that takes care of it.

[GeorgeY, 2012/04/17 20:52:25]

Done already - forgot about this test - it is reverted now

+        db_thread_(BrowserThread::DB) {
+    db_thread_.Start();
+  }
+
+  ~TabStripModelTest() {
+    // Schedule another task on the DB thread to notify us that it's safe to
+    // carry on with the test.
+    base::WaitableEvent done(false, false);
+    BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+    done.Wait();
+    db_thread_.Stop();
   }
 
   TabContentsWrapper* CreateTabContents() {
     return Browser::TabContentsFactory(
         profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
   }
 
   TabContentsWrapper* CreateTabContentsWithSharedRPH(
       WebContents* web_contents) {
     TabContentsWrapper* retval = Browser::TabContentsFactory(profile(),
@@ skipping 93 matching lines @@
     model->SetSelectionFromModel(selection_model);
   }
 
  private:
   base::PropertyAccessor<int>* GetIDAccessor() {
     static base::PropertyAccessor<int> accessor;
     return &accessor;
   }
 
   content::TestBrowserThread browser_thread_;
+  content::TestBrowserThread db_thread_;
 
   std::wstring test_dir_;
   std::wstring profile_path_;
 };
 
 class MockTabStripModelObserver : public TabStripModelObserver {
  public:
   MockTabStripModelObserver()
       : empty_(true),
         model_(NULL) {}
@@ skipping 2182 matching lines @@
   ASSERT_EQ(1, observer.GetStateCount());
   MockTabStripModelObserver::State s(
       contents2, 1, MockTabStripModelObserver::SELECT);
   s.src_contents = contents2;
   s.src_index = 1;
   s.user_gesture = false;
   EXPECT_TRUE(observer.StateEquals(0, s));
   strip.RemoveObserver(&observer);
   strip.CloseAllTabs();
 }