Introduce cc::LocalFrameId and use in SurfaceFactory

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 348 matching lines @@
           last_copy_request_->texture_mailbox().sync_token());
       gl_helper->ResizeTexture(texture, window()->bounds().size());
       gl_helper->DeleteTexture(texture);
     }
   }
 
   cc::SurfaceId surface_id() const {
     return GetDelegatedFrameHost()->SurfaceIdForTesting();
   }
 
-  bool HasFrameData() const {
-    return !surface_id().is_null();
+  const cc::LocalFrameId& GetLocalFrameId() const {
+    return GetDelegatedFrameHost()->LocalFrameIdForTesting();
   }
 
+  bool HasFrameData() const { return !GetLocalFrameId().is_null(); }
+
   bool released_front_lock_active() const {
     return GetDelegatedFrameHost()->ReleasedFrontLockActiveForTesting();
   }
 
   void ReturnResources(const cc::ReturnedResourceArray& resources) {
     GetDelegatedFrameHost()->ReturnResources(resources);
   }
 
   void ResetCompositor() { GetDelegatedFrameHost()->ResetCompositor(); }
 
@@ skipping 2235 matching lines @@
     tick_clock_ = new base::SimpleTestTickClock();
     view_->GetDelegatedFrameHost()->tick_clock_ = base::WrapUnique(tick_clock_);
   }
 
   void OnSwapCompositorFrame() {
     view_->OnSwapCompositorFrame(
         1, MakeDelegatedFrame(1.f, view_rect_.size(), view_rect_));
     cc::SurfaceId surface_id =
         view_->GetDelegatedFrameHost()->SurfaceIdForTesting();
     if (!surface_id.is_null())
-      view_->GetDelegatedFrameHost()->WillDrawSurface(surface_id, view_rect_);
+      view_->GetDelegatedFrameHost()->WillDrawSurface(
+          surface_id.local_frame_id(), view_rect_);
     ASSERT_TRUE(view_->last_copy_request_);
   }
 
   void ReleaseSwappedFrame() {
     std::unique_ptr<cc::CopyOutputRequest> request =
         std::move(view_->last_copy_request_);
     request->SendTextureResult(view_rect_.size(), request->texture_mailbox(),
                                std::unique_ptr<cc::SingleReleaseCallback>());
     RunLoopUntilCallback();
   }
@@ skipping 2036 matching lines @@
 
     // Retrieve the selected text from clipboard and verify it is as expected.
     base::string16 result_text;
     clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text);
     EXPECT_EQ(expected_text, result_text);
   }
 }
 #endif
 
 }  // namespace content