Partial changes to enable net-internals in iOS.

chrome/browser/net/load_timing_observer.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_LOAD_TIMING_OBSERVER_H_
 #define CHROME_BROWSER_NET_LOAD_TIMING_OBSERVER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/time.h"
@@ skipping 11 matching lines @@
 // LoadTimingObserver watches the NetLog event stream and collects the network
 // timing information.
 //
 // LoadTimingObserver lives completely on the IOThread and ignores events from
 // other threads.  It is not safe to use from other threads.
 class LoadTimingObserver : public net::NetLog::ThreadSafeObserver {
  public:
   struct URLRequestRecord {
     URLRequestRecord();
 
+#if !defined(OS_IOS)
     webkit_glue::ResourceLoadTimingInfo timing;

[stuartmorgan, 2012/12/10 12:56:03]

I'm not familiar with this code, but it seems worrying that you are removing
"timing" from "LoadTimingObserver". Does this class do anything useful without
this?

Why does this class live in webkit_glue; could it move out so that we could use
it?

[ramant (doing other things), 2012/12/11 05:34:16]

Removed this change from this CL. Will investigate and submit a separate CL for
moving webkit_glue::ResourceLoadTimingInfo out of webkit_glue.

[mmenke, 2012/12/11 05:46:49]

Don't think you need to, at least not as a prereq for this CL.  This class is
going away soon (Hopefully - working on the CLs now), and gathering this data
will all be done in the network stack.  Suggest you just #ifdef out
ChromeNetLog's dependencies on load_timing_observer, for now.

[ramant (doing other things), 2012/12/11 19:41:40]

Because this class is going away, added back the #if !defined(OS_IOS). When we
get rid of this class, we don't need to make any changes on IOS side (IMO, it is
the least disruptive).

+#endif
     uint32 connect_job_id;
     uint32 socket_log_id;
     bool socket_reused;
     base::TimeTicks base_ticks;
   };
 
   struct HTTPStreamJobRecord {
     HTTPStreamJobRecord();
 
     uint32 socket_log_id;
@@ skipping 58 matching lines @@
   HTTPStreamJobToRecordMap http_stream_job_to_record_;
   ConnectJobToRecordMap connect_job_to_record_;
   SocketToRecordMap socket_to_record_;
   uint32 last_connect_job_id_;
   ConnectJobRecord last_connect_job_record_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadTimingObserver);
 };
 
 #endif  // CHROME_BROWSER_NET_LOAD_TIMING_OBSERVER_H_