content: Rename SurfaceTextureManager::InitInstance to SetInstance.

BUG=323304

Review URL: https://codereview.chromium.org/1122383005

Cr-Commit-Position: refs/heads/master@{#330407}

5 files changed, 5 insertions, 5 deletions

diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index bfbcde0..b1a2add 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -150,7 +150,7 @@ void InternalInitChildProcess(const std::vector<int>& file_ids,
   for (size_t i = 0; i < file_ids.size(); ++i)
     base::GlobalDescriptors::GetInstance()->Set(file_ids[i], file_fds[i]);
 
-  SurfaceTextureManager::InitInstance(new SurfaceTextureManagerImpl(service));
+  SurfaceTextureManager::SetInstance(new SurfaceTextureManagerImpl(service));
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env);
 }
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 643cd38..b55754d 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -571,7 +571,7 @@ void BrowserMainLoop::MainMessageLoopStart() {
 #if defined(OS_ANDROID)
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");
-    SurfaceTextureManager::InitInstance(new BrowserSurfaceTextureManager);
+    SurfaceTextureManager::SetInstance(new BrowserSurfaceTextureManager);
   }
 
   if (!parsed_command_line_.HasSwitch(
diff --git a/content/common/android/surface_texture_manager.cc b/content/common/android/surface_texture_manager.cc
index 8062964..c2cb6ee 100644
--- a/content/common/android/surface_texture_manager.cc
+++ b/content/common/android/surface_texture_manager.cc
@@ -20,7 +20,7 @@ SurfaceTextureManager* SurfaceTextureManager::GetInstance() {
 }
 
 // static
-void SurfaceTextureManager::InitInstance(SurfaceTextureManager* instance) {
+void SurfaceTextureManager::SetInstance(SurfaceTextureManager* instance) {
   DCHECK(!g_instance || !instance);
   g_instance = instance;
 }
diff --git a/content/common/android/surface_texture_manager.h b/content/common/android/surface_texture_manager.h
index cff81b9..30a17dc 100644
--- a/content/common/android/surface_texture_manager.h
+++ b/content/common/android/surface_texture_manager.h
@@ -17,7 +17,7 @@ namespace content {
 class CONTENT_EXPORT SurfaceTextureManager {
  public:
   static SurfaceTextureManager* GetInstance();
-  static void InitInstance(SurfaceTextureManager* instance);
+  static void SetInstance(SurfaceTextureManager* instance);
 
   // Register a surface texture for use in another process.
   virtual void RegisterSurfaceTexture(int surface_texture_id,
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index 6a3610a..464090f 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -135,7 +135,7 @@ void ContentTestSuite::Initialize() {
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 #if defined(OS_ANDROID)
-  SurfaceTextureManager::InitInstance(new TestSurfaceTextureManager);
+  SurfaceTextureManager::SetInstance(new TestSurfaceTextureManager);
 #endif
 }