Revert of Simplify BrowserContext by removing redundant methods.

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 21 matching lines @@
 #include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/histogram_fetcher.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/filename_util.h"
 #include "net/cookies/cookie_store.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/test/python_utils.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 722 matching lines @@
       return false;
   } while (message.compare("\"PENDING\"") == 0);
 
   return message.compare("\"SUCCESS\"") == 0;
 }
 
 std::string GetCookies(BrowserContext* browser_context, const GURL& url) {
   std::string cookies;
   base::WaitableEvent event(true, false);
   net::URLRequestContextGetter* context_getter =
-      BrowserContext::GetDefaultStoragePartition(browser_context)->
-          GetURLRequestContext();
+      browser_context->GetRequestContext();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&GetCookiesOnIOThread, url, base::RetainedRef(context_getter),
                  &event, &cookies));
   event.Wait();
   return cookies;
 }
 
 bool SetCookie(BrowserContext* browser_context,
                const GURL& url,
                const std::string& value) {
   bool result = false;
   base::WaitableEvent event(true, false);
   net::URLRequestContextGetter* context_getter =
-      BrowserContext::GetDefaultStoragePartition(browser_context)->
-          GetURLRequestContext();
+      browser_context->GetRequestContext();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetCookieOnIOThread, url, value,
                  base::RetainedRef(context_getter), &event, &result));
   event.Wait();
   return result;
 }
 
 void FetchHistogramsFromChildProcesses() {
@@ skipping 421 matching lines @@
 // static
 TextInputStateTestExport TextInputStateTestExport::FromWebContents(
     WebContents* web_contents) {
   const TextInputState* state =
       static_cast<WebContentsImpl*>(web_contents)->GetTextInputState();
 
   return TextInputStateTestExport(state->type, state->value);
 }
 
 }  // namespace content