Even more test cleanup. Some fixes to non-test code.

chrome/test/testing_browser_process.h

 // Copyright (c) 2011 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.
 
 // An implementation of BrowserProcess for unit tests that fails for most
 // services. By preventing creation of services, we reduce dependencies and
 // keep the profile clean. Clients of this class must handle the NULL return
 // value, however.
 
 #ifndef CHROME_TEST_TESTING_BROWSER_PROCESS_H_
@@ skipping 102 matching lines @@
   virtual base::WaitableEvent* shutdown_event();
 
   virtual void CheckForInspectorFiles() {}
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
   virtual void StartAutoupdateTimer() {}
 #endif
 
   virtual bool have_inspector_files() const;
 
-  virtual ChromeNetLog* net_log() { return NULL; }
+  virtual ChromeNetLog* net_log();
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
   virtual void SetIPCLoggingEnabled(bool enable) {}
 #endif
 
   void SetPrefService(PrefService* pref_service);
   void SetGoogleURLTracker(GoogleURLTracker* google_url_tracker);
 
  private:
   NotificationService notification_service_;
@@ skipping 19 matching lines @@
 
  private:
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // After the transition is over, we should just stack-allocate it.
   scoped_ptr<TestingBrowserProcess> browser_process_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTestingBrowserProcess);
 };
 
 #endif  // CHROME_TEST_TESTING_BROWSER_PROCESS_H_