Correctly integrate StoragePartition into TestingProfile.

chrome/browser/policy/cloud/device_management_service_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 <ostream>
 #include <vector>
 
 #include "base/bind.h"
-#include "base/message_loop.h"
+#include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/device_management_service.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserThread;
 using testing::Mock;
 using testing::_;
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 const char kServiceUrl[] = "https://example.com/management_service";
 
 // Encoded empty response messages for testing the error code paths.
 const char kResponseEmpty[] = "\x08\x00";
 
 #define PROTO_STRING(name) (std::string(name, arraysize(name) - 1))
 
 // Some helper constants.
 const char kGaiaAuthToken[] = "gaia-auth-token";
 const char kOAuthToken[] = "oauth-token";
 const char kDMToken[] = "device-management-token";
 const char kClientID[] = "device-id";
 const char kRobotAuthCode[] = "robot-oauth-auth-code";
 
 // Unit tests for the device management policy service. The tests are run
 // against a TestURLFetcherFactory that is used to short-circuit the request
 // without calling into the actual network stack.
 class DeviceManagementServiceTestBase : public testing::Test {
  protected:
-  DeviceManagementServiceTestBase()
-      : ui_thread_(BrowserThread::UI, &loop_),
-        io_thread_(BrowserThread::IO, &loop_) {
+  DeviceManagementServiceTestBase() {
     ResetService();
     InitializeService();
   }
 
-  virtual void TearDown() {
+  ~DeviceManagementServiceTestBase() {
     service_.reset();
-    loop_.RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   void ResetService() {
     service_.reset(new DeviceManagementService(kServiceUrl));
   }
 
   void InitializeService() {
     service_->ScheduleInitialization(0);
-    loop_.RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   net::TestURLFetcher* GetFetcher() {
     return factory_.GetFetcherByID(DeviceManagementService::kURLFetcherID);
   }
 
   DeviceManagementRequestJob* StartRegistrationJob() {
     DeviceManagementRequestJob* job =
         service_->CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION);
     job->SetGaiaToken(kGaiaAuthToken);
@@ skipping 78 matching lines @@
 
   MOCK_METHOD3(OnJobDone, void(DeviceManagementStatus, int,
                                const em::DeviceManagementResponse&));
 
   MOCK_METHOD1(OnJobRetry, void(DeviceManagementRequestJob*));
 
   net::TestURLFetcherFactory factory_;
   scoped_ptr<DeviceManagementService> service_;
 
  private:
-  base::MessageLoopForUI loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 };
 
 struct FailedRequestParams {
   FailedRequestParams(DeviceManagementStatus expected_status,
                       net::URLRequestStatus::Status request_status,
                       int http_status,
                       const std::string& response)
       : expected_status_(expected_status),
         request_status_(request_status, 0),
         http_status_(http_status),
@@ skipping 509 matching lines @@
   EXPECT_CALL(*this, OnJobDone(DM_STATUS_REQUEST_FAILED, _, _));
   EXPECT_CALL(*this, OnJobRetry(_)).Times(0);
   fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                             net::ERR_NETWORK_CHANGED));
   fetcher->set_url(GURL(kServiceUrl));
   fetcher->delegate()->OnURLFetchComplete(fetcher);
   Mock::VerifyAndClearExpectations(this);
 }
 
 }  // namespace policy