| Index: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
|
| index dda57e2d832096392f511e7facd3623f7fb5c46d..c552ceb86b5cc4b0ccc96de0ab02dacfa06fd5ab 100644
|
| --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
|
| +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
|
| @@ -16,16 +16,17 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/io_thread.h"
|
| -#include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/prerender/prerender_manager.h"
|
| #include "chrome/browser/prerender/prerender_manager_factory.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
|
| +#include "chrome/common/channel_info.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/base/ui_test_utils.h"
|
| #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
|
| +#include "components/net_log/chrome_net_log.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_ui_message_handler.h"
|
| @@ -281,7 +282,9 @@ void NetInternalsTest::MessageHandler::GetNetLogFileContents(
|
| base::ScopedFILE temp_file_handle(base::OpenFile(temp_file, "w"));
|
| ASSERT_TRUE(temp_file_handle);
|
|
|
| - scoped_ptr<base::Value> constants(NetInternalsUI::GetConstants());
|
| + scoped_ptr<base::Value> constants(net_log::ChromeNetLog::GetConstants(
|
| + base::CommandLine::ForCurrentProcess()->GetCommandLineString(),
|
| + chrome::GetChannelString()));
|
| scoped_ptr<net::WriteToFileNetLogObserver> net_log_logger(
|
| new net::WriteToFileNetLogObserver());
|
| net_log_logger->StartObserving(
|
|
|