[headless] Remove default browser context.

headless/test/headless_browser_test.cc

 // Copyright 2016 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 "headless/test/headless_browser_test.h"
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 129 matching lines @@
   RunTestOnMainThread();
   TearDownOnMainThread();
 
   for (content::RenderProcessHost::iterator i(
            content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->FastShutdownIfPossible();
   }
 }
 
-void HeadlessBrowserTest::SetBrowserOptions(HeadlessBrowser::Options options) {
-  HeadlessContentMainDelegate::GetInstance()->browser()->SetOptionsForTesting(
-      std::move(options));
-}
-
 HeadlessBrowser* HeadlessBrowserTest::browser() const {
   return HeadlessContentMainDelegate::GetInstance()->browser();
 }
 
 bool HeadlessBrowserTest::WaitForLoad(HeadlessWebContents* web_contents) {
   SynchronousLoadObserver load_observer(this, web_contents);
   RunAsynchronousTest();
   return load_observer.navigation_succeeded();
 }
 
@@ skipping 24 matching lines @@
 
 HeadlessAsyncDevTooledBrowserTest::~HeadlessAsyncDevTooledBrowserTest() {}
 
 void HeadlessAsyncDevTooledBrowserTest::DevToolsTargetReady() {
   EXPECT_TRUE(web_contents_->GetDevToolsTarget());
   web_contents_->GetDevToolsTarget()->AttachClient(devtools_client_.get());
   RunDevTooledTest();
 }
 
 void HeadlessAsyncDevTooledBrowserTest::RunTest() {
-  web_contents_ = browser()->CreateWebContentsBuilder().Build();
+  browser_context_ = browser()->CreateBrowserContextBuilder().Build();
+
+  web_contents_ = browser_context_->CreateWebContentsBuilder().Build();
   web_contents_->AddObserver(this);
 
   RunAsynchronousTest();
 
   web_contents_->GetDevToolsTarget()->DetachClient(devtools_client_.get());
   web_contents_->RemoveObserver(this);
   web_contents_->Close();
   web_contents_ = nullptr;
+  browser_context_.reset();
 }
 
 }  // namespace headless