Migrate TabControlFeature from 0.5 to 0.6

blimp/client/core/contents/blimp_contents_impl.cc

 // Copyright 2016 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 "blimp/client/core/contents/blimp_contents_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 
 #if defined(OS_ANDROID)
 #include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {
 namespace client {
 
 namespace {
 
 #if defined(OS_ANDROID)
 const char kBlimpContentsImplAndroidKey[] = "blimp_contents_impl_android";
 #endif  // OS_ANDROID
 }
 
 BlimpContentsImpl::BlimpContentsImpl() : navigation_controller_(this) {}

[David Trainor- moved to gerrit, 2016/08/03 18:55:42]

What do we initialize id_ to in the default constructor?  Should we remove this?

[Menglin, 2016/08/03 23:49:59]

Yeah we can remove the default constructor.

 
-BlimpContentsImpl::~BlimpContentsImpl() {}
+BlimpContentsImpl::BlimpContentsImpl(int id)
+    : navigation_controller_(this), id_(id) {}
+
+BlimpContentsImpl::~BlimpContentsImpl() {
+  FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnContentsDestroyed());
+}
 
 #if defined(OS_ANDROID)
 
 base::android::ScopedJavaLocalRef<jobject>
 BlimpContentsImpl::GetJavaBlimpContentsImpl() {
   return GetBlimpContentsImplAndroid()->GetJavaObject();
 }
 
 BlimpContentsImplAndroid* BlimpContentsImpl::GetBlimpContentsImplAndroid() {
   BlimpContentsImplAndroid* blimp_contents_impl_android =
@@ skipping 19 matching lines @@
 void BlimpContentsImpl::RemoveObserver(BlimpContentsObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void BlimpContentsImpl::NotifyURLLoaded(const GURL& url) {
   FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, OnURLUpdated(url));
 }
 
 }  // namespace client
 }  // namespace blimp