NULL -> nullptr under athena/

athena/content/app_activity_unittest.cc

 /// 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.
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
@@ skipping 19 matching lines @@
 const char kDummyApp2[] = "bbbbbbb";
 
 // A dummy test app activity which works without content / ShellAppWindow.
 class TestAppActivity : public AppActivity {
  public:
   explicit TestAppActivity(const std::string& app_id)
       : AppActivity(app_id),
         view_(new views::View()),
         current_state_(ACTIVITY_VISIBLE) {
     app_activity_registry_ =
-        AppRegistry::Get()->GetAppActivityRegistry(app_id, NULL);
+        AppRegistry::Get()->GetAppActivityRegistry(app_id, nullptr);
     app_activity_registry_->RegisterAppActivity(this);
   }
   virtual ~TestAppActivity() {
     app_activity_registry_->UnregisterAppActivity(this);
   }
 
   AppActivityRegistry* app_activity_registry() {
     return app_activity_registry_;
   }
 
@@ skipping 18 matching lines @@
   virtual aura::Window* GetWindow() override {
     return view_->GetWidget()->GetNativeWindow();
   }
 
   // ActivityViewModel:
   virtual void Init() override {}
   virtual SkColor GetRepresentativeColor() const override { return 0; }
   virtual base::string16 GetTitle() const override { return title_; }
   virtual bool UsesFrame() const override { return true; }
   virtual views::View* GetContentsView() override { return view_; }
-  virtual views::Widget* CreateWidget() override { return NULL; }
+  virtual views::Widget* CreateWidget() override { return nullptr; }
   virtual gfx::ImageSkia GetOverviewModeImage() override {
     return gfx::ImageSkia();
   }
 
  private:
   // If known the registry which holds all activities for the associated app.
   AppActivityRegistry* app_activity_registry_;
 
   // The title of the activity.
   base::string16 title_;
@@ skipping 11 matching lines @@
 class TestExtensionsDelegate : public ExtensionsDelegate {
  public:
   TestExtensionsDelegate() : unload_called_(0), restart_called_(0) {}
   virtual ~TestExtensionsDelegate() {}
 
   int unload_called() const { return unload_called_; }
   int restart_called() const { return restart_called_; }
 
   // ExtensionsDelegate:
   virtual content::BrowserContext* GetBrowserContext() const override {
-    return NULL;
+    return nullptr;
   }
   virtual const extensions::ExtensionSet& GetInstalledExtensions() override {
     return extension_set_;
   }
   // Unload an application. Returns true when unloaded.
   virtual bool UnloadApp(const std::string& app_id) override {
     unload_called_++;
     // Since we did not close anything we let the framework clean up.
     return false;
   }
@@ skipping 14 matching lines @@
   extensions::ExtensionSet extension_set_;
 
   DISALLOW_COPY_AND_ASSIGN(TestExtensionsDelegate);
 };
 
 }  // namespace
 
 // Our testing base.
 class AppActivityTest : public AthenaTestBase {
  public:
-  AppActivityTest() : test_extensions_delegate_(NULL) {}
+  AppActivityTest() : test_extensions_delegate_(nullptr) {}
   virtual ~AppActivityTest() {}
 
   // AthenaTestBase:
   virtual void SetUp() override {
     AthenaTestBase::SetUp();
     // Create and install our TestAppContentDelegate with instrumentation.
     ExtensionsDelegate::Shutdown();
     // The instance will be deleted by ExtensionsDelegate::Shutdown().
     test_extensions_delegate_ = new TestExtensionsDelegate();
   }
@@ skipping 40 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AppActivityTest);
 };
 
 // Only creates one activity and destroys it.
 TEST_F(AppActivityTest, OneAppActivity) {
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
   {
     TestAppActivity* app_activity = CreateAppActivity(kDummyApp1);
     EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
     EXPECT_EQ(1, app_activity->app_activity_registry()->NumberOfActivities());
-    EXPECT_EQ(AppRegistry::Get()->GetAppActivityRegistry(kDummyApp1, NULL),
+    EXPECT_EQ(AppRegistry::Get()->GetAppActivityRegistry(kDummyApp1, nullptr),
               app_activity->app_activity_registry());
     DeleteActivity(app_activity);
   }
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
   EXPECT_EQ(0, test_extensions_delegate()->unload_called());
   EXPECT_EQ(0, test_extensions_delegate()->restart_called());
 }
 
 // Test running of two applications.
 TEST_F(AppActivityTest, TwoAppsWithOneActivityEach) {
@@ skipping 72 matching lines @@
   // After setting our activity to unloaded however the application should get
   // unloaded as requested.
   app_activity->SetCurrentState(Activity::ACTIVITY_UNLOADED);
   RunAllPendingInMessageLoop();
   EXPECT_EQ(1, test_extensions_delegate()->unload_called());
 
   // Check that our created application is gone, and instead a proxy got
   // created.
   ASSERT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   ASSERT_EQ(app_activity_registry,
-            AppRegistry::Get()->GetAppActivityRegistry(kDummyApp1, NULL));
+            AppRegistry::Get()->GetAppActivityRegistry(kDummyApp1, nullptr));
   EXPECT_EQ(0, app_activity_registry->NumberOfActivities());
   Activity* activity_proxy = app_activity_registry->unloaded_activity_proxy();
   ASSERT_TRUE(activity_proxy);
   EXPECT_NE(app_activity, activity_proxy);
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, activity_proxy->GetCurrentState());
   EXPECT_EQ(0, test_extensions_delegate()->restart_called());
 
   // Close the proxy object and make sure that nothing bad happens.
   DeleteActivity(activity_proxy);
 
@@ skipping 69 matching lines @@
   app_activity2->SetCurrentState(Activity::ACTIVITY_UNLOADED);
   RunAllPendingInMessageLoop();
   EXPECT_EQ(0, test_extensions_delegate()->unload_called());
   app_activity3->SetCurrentState(Activity::ACTIVITY_UNLOADED);
   RunAllPendingInMessageLoop();
   EXPECT_EQ(1, test_extensions_delegate()->unload_called());
 
   // Now there should only be the proxy activity left.
   ASSERT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   ASSERT_EQ(app_activity_registry,
-            AppRegistry::Get()->GetAppActivityRegistry(kDummyApp1, NULL));
+            AppRegistry::Get()->GetAppActivityRegistry(kDummyApp1, nullptr));
   EXPECT_EQ(0, app_activity_registry->NumberOfActivities());
   Activity* activity_proxy = app_activity_registry->unloaded_activity_proxy();
   ASSERT_TRUE(activity_proxy);
   EXPECT_NE(app_activity1, activity_proxy);
   EXPECT_NE(app_activity2, activity_proxy);
   EXPECT_NE(app_activity3, activity_proxy);
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, activity_proxy->GetCurrentState());
 
   // Close the proxy object and make sure that nothing bad happens.
   DeleteActivity(activity_proxy);
@@ skipping 30 matching lines @@
   // However - the restart in this test framework does not really restart and
   // all objects should be still there..
   EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
   Activity::Delete(app_activity_registry->unloaded_activity_proxy());
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 }
 
 }  // namespace test
 }  // namespace athena