FBTF: Remove unneeded headers from base/ (part 9)

webkit/tools/test_shell/simple_appcache_system.cc

 // Copyright (c) 2010 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 "webkit/tools/test_shell/simple_appcache_system.h"
 
+#include <string>
+#include <vector>
+
 #include "base/callback.h"
-#include "base/lock.h"
 #include "base/task.h"
 #include "base/waitable_event.h"
 #include "webkit/appcache/appcache_interceptor.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
 using appcache::WebApplicationCacheHostImpl;
 using appcache::AppCacheBackendImpl;
@@ skipping 37 matching lines @@
   explicit SimpleFrontendProxy(SimpleAppCacheSystem* appcache_system)
       : system_(appcache_system) {
   }
 
   void clear_appcache_system() { system_ = NULL; }
 
   virtual void OnCacheSelected(int host_id,
       const appcache::AppCacheInfo& info) {
     if (!system_)
       return;
-    if (system_->is_io_thread())
+    if (system_->is_io_thread()) {
       system_->ui_message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
           this, &SimpleFrontendProxy::OnCacheSelected,
           host_id, info));
-    else if (system_->is_ui_thread()) {
+    } else if (system_->is_ui_thread()) {
       system_->frontend_impl_.OnCacheSelected(host_id, info);
+    } else {
+      NOTREACHED();
     }
-    else
-      NOTREACHED();
   }
 
   virtual void OnStatusChanged(const std::vector<int>& host_ids,
                                appcache::Status status) {
     if (!system_)
       return;
     if (system_->is_io_thread())
       system_->ui_message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
           this, &SimpleFrontendProxy::OnStatusChanged, host_ids, status));
     else if (system_->is_ui_thread())
@@ skipping 358 matching lines @@
 }
 
 void SimpleAppCacheSystem::GetExtraResponseBits(
     URLRequest* request, int64* cache_id, GURL* manifest_url) {
   if (is_initialized()) {
     DCHECK(is_io_thread());
     AppCacheInterceptor::GetExtraResponseInfo(
         request, cache_id, manifest_url);
   }
 }