Moved WebDataService to ProfileKeyedService

chrome/browser/extensions/app_notify_channel_setup_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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
+#include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
 #include "chrome/browser/extensions/app_notify_channel_ui.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/signin/token_service_unittest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
@@ skipping 145 matching lines @@
   scoped_ptr<bool> setup_result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestUI);
 };
 
 }  // namespace
 
 class AppNotifyChannelSetupTest : public testing::Test {
  public:
   AppNotifyChannelSetupTest() : ui_thread_(BrowserThread::UI, &message_loop_),
+                                db_thread_(BrowserThread::DB),
                                 ui_(new TestUI()) {
   }
 
   virtual ~AppNotifyChannelSetupTest() {}
 
   virtual void SetLoggedInUser(const std::string username) {
     TestingPrefService* prefs = profile_.GetTestingPrefService();
     prefs->SetUserPref(prefs::kGoogleServicesUsername,
                        new StringValue(username));
   }
@@ skipping 41 matching lines @@
   }
 
   virtual void RunServerTest(AppNotifyChannelSetup* setup,
                              const std::string& expected_code,
                              const std::string& expected_error) {
     setup->Start();
     message_loop_.Run();
     delegate_.ExpectWasCalled(expected_code, expected_error);
   }
 
+  virtual void SetUp() OVERRIDE {
+    db_thread_.Start();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    // 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();
+  }
+
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread db_thread_;
   TestProfile profile_;
   TestDelegate delegate_;
   scoped_ptr<TestUI> ui_;
   FakeURLFetcherFactory factory_;
 };
 
 TEST_F(AppNotifyChannelSetupTest, LoginFailure) {
   SetupLogin(true, false);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
@@ skipping 43 matching lines @@
   SetupLogin(false, true);
   SetupFetchAccessToken(false);
   SetupLogin(true, true);
   SetupFetchAccessToken(true);
   SetupRecordGrant(true);
   SetupGetChannelId(true);
 
   scoped_refptr<AppNotifyChannelSetup> setup = CreateInstance();
   RunServerTest(setup, "dummy_do_not_use", "");
 }