Switch to standard integer types in extensions/.

extensions/renderer/script_injection.h

 // 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.
 
 #ifndef EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 #define EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "extensions/common/user_script.h"
 #include "extensions/renderer/injection_host.h"
 #include "extensions/renderer/script_injector.h"
 
 struct HostID;
 
@@ skipping 56 matching lines @@
   InjectionResult OnPermissionGranted(ScriptsRunInfo* scripts_run_info);
 
   // Resets the pointer of the injection host when the host is gone.
   void OnHostRemoved();
 
   void invalidate_render_frame() { render_frame_ = nullptr; }
 
   // Accessors.
   content::RenderFrame* render_frame() const { return render_frame_; }
   const HostID& host_id() const { return injection_host_->id(); }
-  int64 request_id() const { return request_id_; }
+  int64_t request_id() const { return request_id_; }
 
  private:
   class FrameWatcher;
 
   // Sends a message to the browser to request permission to inject.
   void RequestPermissionFromBrowser();
 
   // Injects the script. Returns INJECTION_FINISHED if injection has finished,
   // otherwise INJECTION_BLOCKED.
   InjectionResult Inject(ScriptsRunInfo* scripts_run_info);
@@ skipping 18 matching lines @@
   content::RenderFrame* render_frame_;
 
   // The associated injection host.
   scoped_ptr<const InjectionHost> injection_host_;
 
   // The location in the document load at which we inject the script.
   UserScript::RunLocation run_location_;
 
   // This injection's request id. This will be -1 unless the injection is
   // currently waiting on permission.
-  int64 request_id_;
+  int64_t request_id_;
 
   // Whether or not the injection is complete, either via injecting the script
   // or because it will never complete.
   bool complete_;
 
   // Whether or not the injection successfully injected JS.
   bool did_inject_js_;
 
   // Results storage.
   scoped_ptr<base::Value> execution_result_;
 
   // The callback to run upon completing asynchronously.
   CompletionCallback async_completion_callback_;
 
   // A helper class to hold the render frame and watch for its deletion.
   scoped_ptr<FrameWatcher> frame_watcher_;
 
   base::WeakPtrFactory<ScriptInjection> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ScriptInjection);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_SCRIPT_INJECTION_H_