Update monet.

mojo/services/network/network_context.cc

 // Copyright 2014 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 "mojo/services/network/network_context.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
-#include "mojo/common/user_agent.h"
 #include "mojo/services/network/url_loader_impl.h"
 #include "net/log/net_log_util.h"
 #include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 
 namespace mojo {
 
 namespace {
+
 // Logs network information to the specified file.
 const char kLogNetLog[] = "log-net-log";
 
 base::FilePath GetCacheDirectory(const base::FilePath& base_path) {
   return base_path.Append(FILE_PATH_LITERAL("Cache"));
 }
+
+std::string GetUserAgent() {
+  // TODO(vtl): Haha, very funny.
+  return "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like "
+         "Gecko) Chrome/42.0.2311.68 Safari/537.36";
 }
 
+}  // namespace
+
 class NetworkContext::MojoNetLog : public net::NetLog {
  public:
   MojoNetLog() {
     const base::CommandLine* command_line =
         base::CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(kLogNetLog))
       return;
 
     base::FilePath log_path = command_line->GetSwitchValuePath(kLogNetLog);
     base::ScopedFILE file;
@@ skipping 90 matching lines @@
 
 size_t NetworkContext::GetURLLoaderCountForTesting() {
   return url_loaders_.size();
 }
 
 // static
 scoped_ptr<net::URLRequestContext> NetworkContext::MakeURLRequestContext(
     const base::FilePath& base_path) {
   net::URLRequestContextBuilder builder;
   builder.set_accept_language("en-us,en");
-  builder.set_user_agent(mojo::common::GetUserAgent());
+  builder.set_user_agent(GetUserAgent());
   builder.set_proxy_service(net::ProxyService::CreateDirect());
   builder.set_transport_security_persister_path(base_path);
   builder.set_data_enabled(true);
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
 #if defined(OS_ANDROID)
   // On Android, we store the cache on disk becase we can run only a single
   // instance of the shell at a time.
   cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
   cache_params.path = GetCacheDirectory(base_path);
 #else
   // On desktop, we store the cache in memory so we can run many shells
   // in parallel when running tests, otherwise the network services in each
   // shell will corrupt the disk cache.
   cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::IN_MEMORY;
 #endif
 
   builder.EnableHttpCache(cache_params);
   builder.set_file_enabled(true);
 
   return make_scoped_ptr(builder.Build());
 }
 
 }  // namespace mojo